summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRakesh Pandit2014-01-15 18:58:28 +0100
committerAl Viro2014-01-25 09:14:38 +0100
commitac34a1b35eca5ef64cb499e25f776bf42a81a660 (patch)
tree867f339a9197c6718a69b6171a05f732b0f752b2 /fs
parentfs: __fget_light() can use __fget() in slow path (diff)
downloadkernel-qcow2-linux-ac34a1b35eca5ef64cb499e25f776bf42a81a660.tar.gz
kernel-qcow2-linux-ac34a1b35eca5ef64cb499e25f776bf42a81a660.tar.xz
kernel-qcow2-linux-ac34a1b35eca5ef64cb499e25f776bf42a81a660.zip
befs: iget_locked() doesn't return an ERR_PTR
Also fix befs_iget return value if iget_locked fails. Signed-off-by: Rakesh Pandit <rakesh@tuxera.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/befs/linuxvfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index daa15d6ba450..845d2d690ce2 100644
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -324,8 +324,8 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino)
befs_debug(sb, "---> befs_read_inode() " "inode = %lu", ino);
inode = iget_locked(sb, ino);
- if (IS_ERR(inode))
- return inode;
+ if (!inode)
+ return ERR_PTR(-ENOMEM);
if (!(inode->i_state & I_NEW))
return inode;