Skip to content

Commit

Permalink
Ext3: return ENOMEM rather than EIO if sb_getblk fails
Browse files Browse the repository at this point in the history
It will be better to use ENOMEM rather than EIO, because the only
reason that sb_getblk fails is that allocation fails.

Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: Jan Kara <jack@suse.cz>
  • Loading branch information
Wang Shilong authored and Jan Kara committed Jan 21, 2013
1 parent ab6a773 commit c04e88e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions fs/ext3/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@ struct buffer_head *ext3_getblk(handle_t *handle, struct inode *inode,
struct buffer_head *bh;
bh = sb_getblk(inode->i_sb, dummy.b_blocknr);
if (unlikely(!bh)) {
*errp = -EIO;
*errp = -ENOMEM;
goto err;
}
if (buffer_new(&dummy)) {
Expand Down Expand Up @@ -2738,7 +2738,7 @@ static int __ext3_get_inode_loc(struct inode *inode,
"unable to read inode block - "
"inode=%lu, block="E3FSBLK,
inode->i_ino, block);
return -EIO;
return -ENOMEM;
}
if (!buffer_uptodate(bh)) {
lock_buffer(bh);
Expand Down
6 changes: 3 additions & 3 deletions fs/ext3/resize.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ static struct buffer_head *bclean(handle_t *handle, struct super_block *sb,

bh = sb_getblk(sb, blk);
if (unlikely(!bh))
return ERR_PTR(-EIO);
return ERR_PTR(-ENOMEM);
if ((err = ext3_journal_get_write_access(handle, bh))) {
brelse(bh);
bh = ERR_PTR(err);
Expand Down Expand Up @@ -235,7 +235,7 @@ static int setup_new_group_blocks(struct super_block *sb,

gdb = sb_getblk(sb, block);
if (unlikely(!gdb)) {
err = -EIO;
err = -ENOMEM;
goto exit_bh;
}
if ((err = ext3_journal_get_write_access(handle, gdb))) {
Expand Down Expand Up @@ -723,7 +723,7 @@ static void update_backups(struct super_block *sb,

bh = sb_getblk(sb, group * bpg + blk_off);
if (unlikely(!bh)) {
err = -EIO;
err = -ENOMEM;
break;
}
ext3_debug("update metadata backup %#04lx\n",
Expand Down
2 changes: 1 addition & 1 deletion fs/ext3/xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ ext3_xattr_block_set(handle_t *handle, struct inode *inode,
if (unlikely(!new_bh)) {
getblk_failed:
ext3_free_blocks(handle, inode, block, 1);
error = -EIO;
error = -ENOMEM;
goto cleanup;
}
lock_buffer(new_bh);
Expand Down

0 comments on commit c04e88e

Please sign in to comment.