summaryrefslogtreecommitdiff
path: root/fs/ufs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-06-19 14:10:53 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-07-06 17:40:03 -0400
commit5fbfb238f7a0a5c4633438eb5bdfb4810995c76a (patch)
treec68104c989955e2b379851560b4643f1cdf5591f /fs/ufs
parent4eeff4c9326878ff58ef6fe68d2bf22ef877e5a2 (diff)
ufs_inode_getblock(): failure to read an indirect block is -EIO
... and not "write to beginning of the disk", TYVM... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ufs')
-rw-r--r--fs/ufs/inode.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index f2d8cc2166af..ed70147e1cb4 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -349,8 +349,10 @@ ufs_inode_getblock(struct inode *inode, u64 ind_block,
return 0;
bh = sb_bread(sb, ind_block + (index >> shift));
- if (unlikely(!bh))
+ if (unlikely(!bh)) {
+ *err = -EIO;
return 0;
+ }
index &= uspi->s_apbmask >> uspi->s_fpbshift;
if (uspi->fs_magic == UFS2_MAGIC)
@@ -454,7 +456,6 @@ static int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buff
phys64 = ufs_inode_getblock(inode, phys64, offsets[depth - 1],
fragment, &err, &phys, &new, bh_result->b_page);
}
-out:
if (phys64) {
phys64 += frag;
phys = phys64;