Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 860d21e2 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

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: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
parent 9931faca

fs/ext4/extents.c

+14 −11
Original line number Diff line number Diff line
@@ -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);
@@ -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;

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

	}
@@ -796,7 +802,7 @@ err: 
	ext4_ext_drop_refs(path);

	if (alloc)

		kfree(path);

	return ERR_PTR(-EIO);

	return ERR_PTR(ret);

}



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

fs/ext4/indirect.c

+6 −3
Original line number Diff line number Diff line
@@ -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 */
@@ -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) {
@@ -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;

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

		}

fs/ext4/inline.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

fs/ext4/inode.c

+3 −6
Original line number Diff line number Diff line
@@ -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);

fs/ext4/mmp.c

+2 −0
Original line number Diff line number Diff line
@@ -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);