diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-25 23:25:38 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-25 23:25:38 +0400 |
commit | 4d4323ea2dbb506a29260a41b554dfc7de79249e (patch) | |
tree | c79ad1c770bd8b44f4afd3e5e4b5745bbdd42a6a /fs/efs/inode.c | |
parent | 8495e9c4a9616c9d19f23182d0536485902259db (diff) | |
parent | 52e220d357a38cb29fa2e29f34ed94c1d66357f4 (diff) | |
download | linux-4d4323ea2dbb506a29260a41b554dfc7de79249e.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"Assorted fixes from the last week or so"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
VFS: collect_mounts() should return an ERR_PTR
bfs: iget_locked() doesn't return an ERR_PTR
efs: iget_locked() doesn't return an ERR_PTR()
proc: kill the extra proc_readfd_common()->dir_emit_dots()
cope with potentially long ->d_dname() output for shmem/hugetlb
Diffstat (limited to 'fs/efs/inode.c')
-rw-r--r-- | fs/efs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/efs/inode.c b/fs/efs/inode.c index f3913eb2c474..d15ccf20f1b3 100644 --- a/fs/efs/inode.c +++ b/fs/efs/inode.c @@ -57,7 +57,7 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino) struct inode *inode; inode = iget_locked(super, ino); - if (IS_ERR(inode)) + if (!inode) return ERR_PTR(-ENOMEM); if (!(inode->i_state & I_NEW)) return inode; |