Unverified Commit cba54d55 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11370 nilfs2: handle inconsistent state in nilfs_btnode_create_block() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cui GaoSheng <cuigaosheng1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AMWUHNGDVEZB6A3SLACVJZBHCD55Q5N5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKQ0L 
 
Link:https://gitee.com/openeuler/kernel/pulls/11370

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents ea7a693e 10bffd83

fs/nilfs2/btnode.c

+20 −5
Original line number Diff line number Diff line
@@ -34,12 +34,21 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr) 


	bh = nilfs_grab_buffer(inode, btnc, blocknr, BIT(BH_NILFS_Node));

	if (unlikely(!bh))

		return NULL;

		return ERR_PTR(-ENOMEM);



	if (unlikely(buffer_mapped(bh) || buffer_uptodate(bh) ||

		     buffer_dirty(bh))) {

		brelse(bh);

		BUG();

		/*

		 * The block buffer at the specified new address was already

		 * in use.  This can happen if it is a virtual block number

		 * and has been reallocated due to corruption of the bitmap

		 * used to manage its allocation state (if not, the buffer

		 * clearing of an abandoned b-tree node is missing somewhere).

		 */

		nilfs_error(inode->i_sb,

			    "state inconsistency probably due to duplicate use of b-tree node block address %llu (ino=%lu)",

			    (unsigned long long)blocknr, inode->i_ino);

		goto failed;

	}

	memset(bh->b_data, 0, i_blocksize(inode));

	bh->b_bdev = inode->i_sb->s_bdev;
@@ -50,6 +59,12 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr) 
	unlock_page(bh->b_page);

	put_page(bh->b_page);

	return bh;



failed:

	unlock_page(bh->b_page);

	put_page(bh->b_page);

	brelse(bh);

	return ERR_PTR(-EIO);

}



int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr,
@@ -207,8 +222,8 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc, 
	}



	nbh = nilfs_btnode_create_block(btnc, newkey);

	if (!nbh)

		return -ENOMEM;

	if (IS_ERR(nbh))

		return PTR_ERR(nbh);



	BUG_ON(nbh == obh);

	ctxt->newbh = nbh;

fs/nilfs2/btree.c

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ static int nilfs_btree_get_new_block(const struct nilfs_bmap *btree, 
	struct buffer_head *bh;



	bh = nilfs_btnode_create_block(btnc, ptr);

	if (!bh)

		return -ENOMEM;

	if (IS_ERR(bh))

		return PTR_ERR(bh);



	set_buffer_nilfs_volatile(bh);

	*bhp = bh;