Skip to content

Commit

Permalink
ext4: return ENOMEM if sb_getblk() fails
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@tytso
tytso committed Jan 12, 2013
1 parent 9931fac commit 860d21e
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 26 deletions.
25 changes: 14 additions & 11 deletions fs/ext4/extents.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,7 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block,
struct ext4_extent_header *eh;
struct buffer_head *bh;
short int depth, i, ppos = 0, alloc = 0;
int ret;

eh = ext_inode_hdr(inode);
depth = ext_depth(inode);
Expand Down Expand Up @@ -752,12 +753,15 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block,
path[ppos].p_ext = NULL;

bh = sb_getblk(inode->i_sb, path[ppos].p_block);
if (unlikely(!bh))
if (unlikely(!bh)) {
ret = -ENOMEM;
goto err;
}
if (!bh_uptodate_or_lock(bh)) {
trace_ext4_ext_load_extent(inode, block,
path[ppos].p_block);
if (bh_submit_read(bh) < 0) {
ret = bh_submit_read(bh);
if (ret < 0) {
put_bh(bh);
goto err;
}
Expand All @@ -768,13 +772,15 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block,
put_bh(bh);
EXT4_ERROR_INODE(inode,
"ppos %d > depth %d", ppos, depth);
ret = -EIO;
goto err;
}
path[ppos].p_bh = bh;
path[ppos].p_hdr = eh;
i--;

if (ext4_ext_check_block(inode, eh, i, bh))
ret = ext4_ext_check_block(inode, eh, i, bh);
if (ret < 0)
goto err;
}

Expand All @@ -796,7 +802,7 @@ ext4_ext_find_extent(struct inode *inode, ext4_lblk_t block,
ext4_ext_drop_refs(path);
if (alloc)
kfree(path);
return ERR_PTR(-EIO);
return ERR_PTR(ret);
}

/*
Expand Down Expand Up @@ -951,7 +957,7 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,
}
bh = sb_getblk(inode->i_sb, newblock);
if (!bh) {
err = -EIO;
err = -ENOMEM;
goto cleanup;
}
lock_buffer(bh);
Expand Down Expand Up @@ -1024,7 +1030,7 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,
newblock = ablocks[--a];
bh = sb_getblk(inode->i_sb, newblock);
if (!bh) {
err = -EIO;
err = -ENOMEM;
goto cleanup;
}
lock_buffer(bh);
Expand Down Expand Up @@ -1136,11 +1142,8 @@ static int ext4_ext_grow_indepth(handle_t *handle, struct inode *inode,
return err;

bh = sb_getblk(inode->i_sb, newblock);
if (!bh) {
err = -EIO;
ext4_std_error(inode->i_sb, err);
return err;
}
if (!bh)
return -ENOMEM;
lock_buffer(bh);

err = ext4_journal_get_create_access(handle, bh);
Expand Down
9 changes: 6 additions & 3 deletions fs/ext4/indirect.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ static Indirect *ext4_get_branch(struct inode *inode, int depth,
struct super_block *sb = inode->i_sb;
Indirect *p = chain;
struct buffer_head *bh;
int ret = -EIO;

*err = 0;
/* i_data is not going away, no lock needed */
Expand All @@ -154,8 +155,10 @@ static Indirect *ext4_get_branch(struct inode *inode, int depth,
goto no_block;
while (--depth) {
bh = sb_getblk(sb, le32_to_cpu(p->key));
if (unlikely(!bh))
if (unlikely(!bh)) {
ret = -ENOMEM;
goto failure;
}

if (!bh_uptodate_or_lock(bh)) {
if (bh_submit_read(bh) < 0) {
Expand All @@ -177,7 +180,7 @@ static Indirect *ext4_get_branch(struct inode *inode, int depth,
return NULL;

failure:
*err = -EIO;
*err = ret;
no_block:
return p;
}
Expand Down Expand Up @@ -471,7 +474,7 @@ static int ext4_alloc_branch(handle_t *handle, struct inode *inode,
*/
bh = sb_getblk(inode->i_sb, new_blocks[n-1]);
if (unlikely(!bh)) {
err = -EIO;
err = -ENOMEM;
goto failed;
}

Expand Down
2 changes: 1 addition & 1 deletion fs/ext4/inline.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,7 @@ static int ext4_convert_inline_data_nolock(handle_t *handle,

data_bh = sb_getblk(inode->i_sb, map.m_pblk);
if (!data_bh) {
error = -EIO;
error = -ENOMEM;
goto out_restore;
}

Expand Down
9 changes: 3 additions & 6 deletions fs/ext4/inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 2 additions & 0 deletions fs/ext4/mmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
* is not blocked in the elevator. */
if (!*bh)
*bh = sb_getblk(sb, mmp_block);
if (!*bh)
return -ENOMEM;
if (*bh) {
get_bh(*bh);
lock_buffer(*bh);
Expand Down
8 changes: 4 additions & 4 deletions fs/ext4/resize.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ static struct buffer_head *bclean(handle_t *handle, struct super_block *sb,

bh = sb_getblk(sb, blk);
if (!bh)
return ERR_PTR(-EIO);
return ERR_PTR(-ENOMEM);
if ((err = ext4_journal_get_write_access(handle, bh))) {
brelse(bh);
bh = ERR_PTR(err);
Expand Down Expand Up @@ -411,7 +411,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,

bh = sb_getblk(sb, flex_gd->groups[group].block_bitmap);
if (!bh)
return -EIO;
return -ENOMEM;

err = ext4_journal_get_write_access(handle, bh);
if (err)
Expand Down Expand Up @@ -501,7 +501,7 @@ static int setup_new_flex_group_blocks(struct super_block *sb,

gdb = sb_getblk(sb, block);
if (!gdb) {
err = -EIO;
err = -ENOMEM;
goto out;
}

Expand Down Expand Up @@ -1065,7 +1065,7 @@ static void update_backups(struct super_block *sb, int blk_off, char *data,

bh = sb_getblk(sb, backup_block);
if (!bh) {
err = -EIO;
err = -ENOMEM;
break;
}
ext4_debug("update metadata backup %llu(+%llu)\n",
Expand Down
3 changes: 2 additions & 1 deletion fs/ext4/xattr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -887,16 +887,17 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,

new_bh = sb_getblk(sb, block);
if (!new_bh) {
error = -ENOMEM;
getblk_failed:
ext4_free_blocks(handle, inode, NULL, block, 1,
EXT4_FREE_BLOCKS_METADATA);
error = -EIO;
goto cleanup;
}
lock_buffer(new_bh);
error = ext4_journal_get_create_access(handle, new_bh);
if (error) {
unlock_buffer(new_bh);
error = -EIO;
goto getblk_failed;
}
memcpy(new_bh->b_data, s->base, new_bh->b_size);
Expand Down

0 comments on commit 860d21e

Please sign in to comment.