diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 12:54:01 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 12:54:01 -0800 |
commit | ca5b857cb0f42986520abd9dbb0c2508067342b2 (patch) | |
tree | 7418db33a7156b33bbdf6fff337f5f04e0c4137c /fs/namei.c | |
parent | a0e136e5da98f10ecb41a673374a04102af45e2b (diff) | |
parent | c02b1a9b41c2e728289f96850580a3651e0a8b5f (diff) | |
download | linux-ca5b857cb0f42986520abd9dbb0c2508067342b2.tar.gz |
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/namei.c')
-rw-r--r-- | fs/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index 287781363763..f0c7a7b9b6ca 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3459,7 +3459,7 @@ static int do_tmpfile(struct nameidata *nd, unsigned flags, goto out; child = vfs_tmpfile(path.dentry, op->mode, op->open_flag); error = PTR_ERR(child); - if (unlikely(IS_ERR(child))) + if (IS_ERR(child)) goto out2; dput(path.dentry); path.dentry = child; |