ext4: return ENOMEM if sb_getblk() fails

The only reason for sb_getblk() failing is if it can't allocate the
buffer_head.  So ENOMEM is more appropriate than EIO.  In addition,
make sure that the file system is marked as being inconsistent if
sb_getblk() fails.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org

1 files changed, 3 insertions, 6 deletions

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index cbfe13bf5b2a..9ccc140b82d2 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -714,7 +714,7 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode,
 
         bh = sb_getblk(inode->i_sb, map.m_pblk);
         if (!bh) {
-                *errp = -EIO;
+                *errp = -ENOMEM;
                 return NULL;
         }
         if (map.m_flags & EXT4_MAP_NEW) {
@@ -3660,11 +3660,8 @@ static int __ext4_get_inode_loc(struct inode *inode,
         iloc->offset = (inode_offset % inodes_per_block) * EXT4_INODE_SIZE(sb);
 
         bh = sb_getblk(sb, block);
-        if (!bh) {
-                EXT4_ERROR_INODE_BLOCK(inode, block,
-                                       "unable to read itable block");
-                return -EIO;
-        }
+        if (!bh)
+                return -ENOMEM;
         if (!buffer_uptodate(bh)) {
                 lock_buffer(bh);