Ext3: return ENOMEM rather than EIO if sb_getblk fails

PATCH In review Wang Shilong 1 participant 1 message Jan 15, 2013

lore

Share & tools

lore

Wang Shilong

author

2013-01-15 13:10 UTC #0 lore raw

PATCH v2 2/2 Ext3: return ENOMEM rather than EIO if sb_getblk fails

From: Wang Shilong <[email protected]>

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 <[email protected]>

---
 fs/ext3/inode.c  |    4 ++--
 fs/ext3/resize.c |    6 +++---
 fs/ext3/xattr.c  |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

fs/ext3/inode.c +2 -2

index 7338a76..eecedfd 100644
@@ -1084,7 +1084,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)) {

@@ -2739,7 +2739,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);

fs/ext3/resize.c +3 -3

index 704e8ce..2710565 100644
@@ -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",

fs/ext3/xattr.c +1 -1

index 9f57470..b1fc963 100644
@@ -816,7 +816,7 @@ inserted:
 			if (unlikely(!new_bh)) {
 getblk_failed:
 				ext3_free_blocks(handle, inode, block, 1);
-				error = -EIO;
+				error = -ENOMEM;
 				goto cleanup;
 			}
 			lock_buffer(new_bh);

-- 1.7.7.6