Skip to content

Commit 5bf9a06

Browse files
committed
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()
2 parents 9455d25 + 5c8b0df commit 5bf9a06

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

fs/dcache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1681,7 +1681,7 @@ EXPORT_SYMBOL(d_invalidate);
16811681
* copied and the copy passed in may be reused after this call.
16821682
*/
16831683

1684-
struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
1684+
static struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
16851685
{
16861686
struct dentry *dentry;
16871687
char *dname;

fs/fcntl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ static long fcntl_rw_hint(struct file *file, unsigned int cmd,
277277
unsigned long arg)
278278
{
279279
struct inode *inode = file_inode(file);
280-
u64 *argp = (u64 __user *)arg;
280+
u64 __user *argp = (u64 __user *)arg;
281281
enum rw_hint hint;
282282
u64 h;
283283

fs/internal.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ extern int invalidate_inodes(struct super_block *, bool);
151151
/*
152152
* dcache.c
153153
*/
154-
extern struct dentry *__d_alloc(struct super_block *, const struct qstr *);
155154
extern int d_set_mounted(struct dentry *dentry);
156155
extern long prune_dcache_sb(struct super_block *sb, struct shrink_control *sc);
157156
extern struct dentry *d_alloc_cursor(struct dentry *);

fs/namespace.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2356,7 +2356,7 @@ static struct file *open_detached_copy(struct path *path, bool recursive)
23562356
return file;
23572357
}
23582358

2359-
SYSCALL_DEFINE3(open_tree, int, dfd, const char *, filename, unsigned, flags)
2359+
SYSCALL_DEFINE3(open_tree, int, dfd, const char __user *, filename, unsigned, flags)
23602360
{
23612361
struct file *file;
23622362
struct path path;
@@ -3514,8 +3514,8 @@ SYSCALL_DEFINE3(fsmount, int, fs_fd, unsigned int, flags,
35143514
* Note the flags value is a combination of MOVE_MOUNT_* flags.
35153515
*/
35163516
SYSCALL_DEFINE5(move_mount,
3517-
int, from_dfd, const char *, from_pathname,
3518-
int, to_dfd, const char *, to_pathname,
3517+
int, from_dfd, const char __user *, from_pathname,
3518+
int, to_dfd, const char __user *, to_pathname,
35193519
unsigned int, flags)
35203520
{
35213521
struct path from_path, to_path;

0 commit comments

Comments
 (0)