diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 21:54:01 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 21:54:01 +0100 |
commit | ca5b857cb0f42986520abd9dbb0c2508067342b2 (patch) | |
tree | 7418db33a7156b33bbdf6fff337f5f04e0c4137c /fs/fhandle.c | |
parent | Merge branch 'work.get_user_pages_fast' of git://git.kernel.org/pub/scm/linux... (diff) | |
parent | vfs: grab the lock instead of blocking in __fd_install during resizing (diff) | |
download | linux-ca5b857cb0f42986520abd9dbb0c2508067342b2.tar.xz linux-ca5b857cb0f42986520abd9dbb0c2508067342b2.zip |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted stuff, really no common topic here"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
vfs: grab the lock instead of blocking in __fd_install during resizing
vfs: stop clearing close on exec when closing a fd
include/linux/fs.h: fix comment about struct address_space
fs: make fiemap work from compat_ioctl
coda: fix 'kernel memory exposure attempt' in fsync
pstore: remove unneeded unlikely()
vfs: remove unneeded unlikely()
stubs for mount_bdev() and kill_block_super() in !CONFIG_BLOCK case
make vfs_ustat() static
do_handle_open() should be static
elf_fdpic: fix unused variable warning
fold destroy_super() into __put_super()
new helper: destroy_unused_super()
fix address space warnings in ipc/
acct.h: get rid of detritus
Diffstat (limited to 'fs/fhandle.c')
-rw-r--r-- | fs/fhandle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fhandle.c b/fs/fhandle.c index 474adc8d2a3a..0ace128f5d23 100644 --- a/fs/fhandle.c +++ b/fs/fhandle.c @@ -213,8 +213,8 @@ out_err: return retval; } -long do_handle_open(int mountdirfd, - struct file_handle __user *ufh, int open_flag) +static long do_handle_open(int mountdirfd, struct file_handle __user *ufh, + int open_flag) { long retval = 0; struct path path; |