openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ext3: return ENOMEM rather than EIO if sb_getblk fails 

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>
This commit is contained in:
Wang Shilong 2013-01-15 21:20:01 -08:00 committed by Jan Kara
parent ab6a773dbc
commit c04e88e271
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ext3/inode.c
View File

@ -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)) {
@ -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);

6
fs/ext3/resize.c
View File

@ -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);
@ -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))) {
@ -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",

2
fs/ext3/xattr.c
View File

@ -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);