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

Commit 7391a294 authored by Rui Xiang's avatar Rui Xiang Committed by Linus Torvalds
Browse files

ocfs2: return ENOMEM when sb_getblk() fails 



The only reason for sb_getblk() failing is if it can't allocate the
buffer_head.  So return ENOMEM instead when it fails.

[joseph.qi@huawei.com: ocfs2_symlink_get_block() and ocfs2_read_blocks_sync() and ocfs2_read_blocks() need the same change]
Signed-off-by: default avatarRui Xiang <rui.xiang@huawei.com>
Reviewed-by: default avatarJie Liu <jeff.liu@oracle.com>
Reviewed-by: default avatarMark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Joseph Qi <joseph.qi@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f0cb0f0b

fs/ocfs2/alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ static int ocfs2_create_new_meta_bhs(handle_t *handle, 
		for(i = count;  i < (num_got + count); i++) {

			bhs[i] = sb_getblk(osb->sb, first_blkno);

			if (bhs[i] == NULL) {

				status = -EIO;

				status = -ENOMEM;

				mlog_errno(status);

				goto bail;

			}

fs/ocfs2/aops.c

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, 


	if ((u64)iblock >= ocfs2_clusters_to_blocks(inode->i_sb,

						    le32_to_cpu(fe->i_clusters))) {

		err = -ENOMEM;

		mlog(ML_ERROR, "block offset is outside the allocated size: "

		     "%llu\n", (unsigned long long)iblock);

		goto bail;
@@ -92,6 +93,7 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, 
			    iblock;

		buffer_cache_bh = sb_getblk(osb->sb, blkno);

		if (!buffer_cache_bh) {

			err = -ENOMEM;

			mlog(ML_ERROR, "couldn't getblock for symlink!\n");

			goto bail;

		}

fs/ocfs2/buffer_head_io.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ int ocfs2_read_blocks_sync(struct ocfs2_super *osb, u64 block, 
		if (bhs[i] == NULL) {

			bhs[i] = sb_getblk(osb->sb, block++);

			if (bhs[i] == NULL) {

				status = -EIO;

				status = -ENOMEM;

				mlog_errno(status);

				goto bail;

			}
@@ -214,7 +214,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, 
			bhs[i] = sb_getblk(sb, block++);

			if (bhs[i] == NULL) {

				ocfs2_metadata_cache_io_unlock(ci);

				status = -EIO;

				status = -ENOMEM;

				mlog_errno(status);

				goto bail;

			}

fs/ocfs2/dir.c

+4 −4
Original line number Diff line number Diff line
@@ -2349,7 +2349,7 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb, 


	dx_root_bh = sb_getblk(osb->sb, dr_blkno);

	if (dx_root_bh == NULL) {

		ret = -EIO;

		ret = -ENOMEM;

		goto out;

	}

	ocfs2_set_new_buffer_uptodate(INODE_CACHE(dir), dx_root_bh);
@@ -2422,7 +2422,7 @@ static int ocfs2_dx_dir_format_cluster(struct ocfs2_super *osb, 
	for (i = 0; i < num_dx_leaves; i++) {

		bh = sb_getblk(osb->sb, start_blk + i);

		if (bh == NULL) {

			ret = -EIO;

			ret = -ENOMEM;

			goto out;

		}

		dx_leaves[i] = bh;
@@ -2929,7 +2929,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, 
	blkno = ocfs2_clusters_to_blocks(dir->i_sb, bit_off);

	dirdata_bh = sb_getblk(sb, blkno);

	if (!dirdata_bh) {

		ret = -EIO;

		ret = -ENOMEM;

		mlog_errno(ret);

		goto out_commit;

	}
@@ -3159,7 +3159,7 @@ static int ocfs2_do_extend_dir(struct super_block *sb, 


	*new_bh = sb_getblk(sb, p_blkno);

	if (!*new_bh) {

		status = -EIO;

		status = -ENOMEM;

		mlog_errno(status);

		goto bail;

	}

fs/ocfs2/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int __ocfs2_mknod_locked(struct inode *dir, 


	*new_fe_bh = sb_getblk(osb->sb, fe_blkno);

	if (!*new_fe_bh) {

		status = -EIO;

		status = -ENOMEM;

		mlog_errno(status);

		goto leave;

	}