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>

diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index d7df06839f6a002f51095a905a8230b7d96637d2..d512c4bc4ad7103b968d454266d1814b8d59de41 100644 (file)
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -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);

diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index 704e8ce7d782e434a73798fc08d48e5e1aef6b04..27105655502cf90a0fa3bb05020698cebfda429a 100644 (file)
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -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",

diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
index 9f57470b1727868bfb8d22da1e0df11a1a98aeb3..b1fc96383e087157879e853b2affbf0cb87982ec 100644 (file)
--- a/fs/ext3/xattr.c
+++ b/fs/ext3/xattr.c
@@ -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);