Commit 5bf9a06a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc vfs cleanups from Al Viro:
 "No common topic, just three cleanups".

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  make __d_alloc() static
  fs/namespace: add __user to open_tree and move_mount syscalls
  fs/fnctl: fix missing __user in fcntl_rw_hint()
parents 9455d25f 5c8b0dfc

fs/dcache.c

+1 −1
Original line number Diff line number Diff line
@@ -1681,7 +1681,7 @@ EXPORT_SYMBOL(d_invalidate); 
 * copied and the copy passed in may be reused after this call.

 */

 

struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)

static struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)

{

	struct dentry *dentry;

	char *dname;

fs/fcntl.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static long fcntl_rw_hint(struct file *file, unsigned int cmd, 
			  unsigned long arg)

{

	struct inode *inode = file_inode(file);

	u64 *argp = (u64 __user *)arg;

	u64 __user *argp = (u64 __user *)arg;

	enum rw_hint hint;

	u64 h;

fs/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ extern int invalidate_inodes(struct super_block *, bool); 
/*

 * dcache.c

 */

extern struct dentry *__d_alloc(struct super_block *, const struct qstr *);

extern int d_set_mounted(struct dentry *dentry);

extern long prune_dcache_sb(struct super_block *sb, struct shrink_control *sc);

extern struct dentry *d_alloc_cursor(struct dentry *);

fs/namespace.c

+3 −3
Original line number Diff line number Diff line
@@ -2356,7 +2356,7 @@ static struct file *open_detached_copy(struct path *path, bool recursive) 
	return file;

}



SYSCALL_DEFINE3(open_tree, int, dfd, const char *, filename, unsigned, flags)

SYSCALL_DEFINE3(open_tree, int, dfd, const char __user *, filename, unsigned, flags)

{

	struct file *file;

	struct path path;
@@ -3514,8 +3514,8 @@ SYSCALL_DEFINE3(fsmount, int, fs_fd, unsigned int, flags, 
 * Note the flags value is a combination of MOVE_MOUNT_* flags.

 */

SYSCALL_DEFINE5(move_mount,

		int, from_dfd, const char *, from_pathname,

		int, to_dfd, const char *, to_pathname,

		int, from_dfd, const char __user *, from_pathname,

		int, to_dfd, const char __user *, to_pathname,

		unsigned int, flags)

{

	struct path from_path, to_path;