diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-08 11:08:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-08 11:08:28 -0800 |
| commit | 5bf9a06a5f7ca525621f4117257a49dc5a2786da (patch) | |
| tree | 654fec78ab7b0abcbd583db4a062f85cc7ce6b3d /fs/fcntl.c | |
| parent | 9455d25f4e3b3d009fa1b810862e5b06229530e4 (diff) | |
| parent | 5c8b0dfc6f4a5e6c707827d0172fc1572e689094 (diff) | |
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()
Diffstat (limited to 'fs/fcntl.c')
| -rw-r--r-- | fs/fcntl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 41b6438bd2d9..9bc167562ee8 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -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; |