path: root/fs/bfs/inode.c
diff options
authorLinus Torvalds <>2013-08-25 12:25:38 -0700
committerLinus Torvalds <>2013-08-25 12:25:38 -0700
commit4d4323ea2dbb506a29260a41b554dfc7de79249e (patch)
treec79ad1c770bd8b44f4afd3e5e4b5745bbdd42a6a /fs/bfs/inode.c
parent8495e9c4a9616c9d19f23182d0536485902259db (diff)
parent52e220d357a38cb29fa2e29f34ed94c1d66357f4 (diff)
Merge branch 'for-linus' of git://
Pull vfs fixes from Al Viro: "Assorted fixes from the last week or so" * 'for-linus' of git:// 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/bfs/inode.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index 5e376bb93419..8defc6b3f9a2 100644
--- a/fs/bfs/inode.c
+++ b/fs/bfs/inode.c
@@ -40,7 +40,7 @@ struct inode *bfs_iget(struct super_block *sb, unsigned long ino)
int block, off;
inode = iget_locked(sb, ino);
- if (IS_ERR(inode))
+ if (!inode)
return ERR_PTR(-ENOMEM);
if (!(inode->i_state & I_NEW))
return inode;