summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2009-08-22 12:10:07 +0200
committerRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2009-09-14 11:27:12 +0200
commit1b2f5a641bca91966fd91dc489238068a0ab4b69 (patch)
tree85ab9020e9628d43ffabc6ab354efcf6ea1ef3d2 /fs
parentLinux 2.6.31 (diff)
downloadlinux-1b2f5a641bca91966fd91dc489238068a0ab4b69.tar.xz
linux-1b2f5a641bca91966fd91dc489238068a0ab4b69.zip
nilfs2: fix ignored error code in __nilfs_read_inode()
The __nilfs_read_inode function is ignoring the error code returned from nilfs_read_inode_common(), and wrongly delivers a success code (zero) when it escapes from the function in erroneous cases. This adds the missing error handling. Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs')
-rw-r--r--fs/nilfs2/inode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index fe9d8f2a13f8..807e584b163d 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -430,7 +430,8 @@ static int __nilfs_read_inode(struct super_block *sb, unsigned long ino,
raw_inode = nilfs_ifile_map_inode(sbi->s_ifile, ino, bh);
- if (nilfs_read_inode_common(inode, raw_inode))
+ err = nilfs_read_inode_common(inode, raw_inode);
+ if (err)
goto failed_unmap;
if (S_ISREG(inode->i_mode)) {