Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe35d4a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  jfs: Fix 32bit build warning
  Remove obsolete comment in fs.h
  Sanitize f_flags helpers
  Fix f_flags/f_mode in case of lookup_instantiate_filp() from open(pathname, 3)
  anonfd: Allow making anon files read-only
  fs/compat_ioctl.c: fix build error when !BLOCK
  pohmelfs needs I_LOCK
  alloc_file(): simplify handling of mnt_clone_write() errors
parents 9917f7bb 28ba0ec6

drivers/staging/pohmelfs/dir.c

+0 −2
Original line number Diff line number Diff line
@@ -722,8 +722,6 @@ static int pohmelfs_remove_entry(struct inode *dir, struct dentry *dentry) 
		if (inode->i_nlink)

			inode_dec_link_count(inode);

	}

	dprintk("%s: inode: %p, lock: %ld, unhashed: %d.\n",

		__func__, pi, inode->i_state & I_LOCK, hlist_unhashed(&inode->i_hash));



	return err;

}

fs/anon_inodes.c

+2 −2
Original line number Diff line number Diff line
@@ -121,13 +121,13 @@ struct file *anon_inode_getfile(const char *name, 
	d_instantiate(path.dentry, anon_inode_inode);



	error = -ENFILE;

	file = alloc_file(&path, FMODE_READ | FMODE_WRITE, fops);

	file = alloc_file(&path, OPEN_FMODE(flags), fops);

	if (!file)

		goto err_dput;

	file->f_mapping = anon_inode_inode->i_mapping;



	file->f_pos = 0;

	file->f_flags = O_RDWR | (flags & O_NONBLOCK);

	file->f_flags = flags & (O_ACCMODE | O_NONBLOCK);

	file->f_version = 0;

	file->private_data = priv;

fs/compat_ioctl.c

+0 −2
Original line number Diff line number Diff line
@@ -1600,8 +1600,6 @@ static long do_ioctl_trans(int fd, unsigned int cmd, 
	case KDSKBMETA:

	case KDSKBLED:

	case KDSETLED:

	/* SG stuff */

	case SG_SET_TRANSFORM:

	/* AUTOFS */

	case AUTOFS_IOC_READY:

	case AUTOFS_IOC_FAIL:

fs/eventfd.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ struct file *eventfd_file_create(unsigned int count, int flags) 
	ctx->flags = flags;



	file = anon_inode_getfile("[eventfd]", &eventfd_fops, ctx,

				  flags & EFD_SHARED_FCNTL_FLAGS);

				  O_RDWR | (flags & EFD_SHARED_FCNTL_FLAGS));

	if (IS_ERR(file))

		eventfd_free_ctx(ctx);

fs/eventpoll.c

+1 −1
Original line number Diff line number Diff line
@@ -1206,7 +1206,7 @@ SYSCALL_DEFINE1(epoll_create1, int, flags) 
	 * a file structure and a free file descriptor.

	 */

	error = anon_inode_getfd("[eventpoll]", &eventpoll_fops, ep,

				 flags & O_CLOEXEC);

				 O_RDWR | (flags & O_CLOEXEC));

	if (error < 0)

		ep_free(ep);