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

!8254 sysv: don't call sb_bread() with pointers_lock held 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/F7TH33OEGU7CHZBH6Q263GSHGFG7WWY2/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QGIO 
 
Link:https://gitee.com/openeuler/kernel/pulls/8254

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents dda152e1 86bef604

fs/sysv/itree.c

+4 −6
Original line number Diff line number Diff line
@@ -82,9 +82,6 @@ static inline sysv_zone_t *block_end(struct buffer_head *bh) 
	return (sysv_zone_t*)((char*)bh->b_data + bh->b_size);

}



/*

 * Requires read_lock(&pointers_lock) or write_lock(&pointers_lock)

 */

static Indirect *get_branch(struct inode *inode,

			    int depth,

			    int offsets[],
@@ -104,15 +101,18 @@ static Indirect *get_branch(struct inode *inode, 
		bh = sb_bread(sb, block);

		if (!bh)

			goto failure;

		read_lock(&pointers_lock);

		if (!verify_chain(chain, p))

			goto changed;

		add_chain(++p, bh, (sysv_zone_t*)bh->b_data + *++offsets);

		read_unlock(&pointers_lock);

		if (!p->key)

			goto no_block;

	}

	return NULL;



changed:

	read_unlock(&pointers_lock);

	brelse(bh);

	*err = -EAGAIN;

	goto no_block;
@@ -218,9 +218,7 @@ static int get_block(struct inode *inode, sector_t iblock, struct buffer_head *b 
		goto out;



reread:

	read_lock(&pointers_lock);

	partial = get_branch(inode, depth, offsets, chain, &err);

	read_unlock(&pointers_lock);



	/* Simplest case - block found, no allocation needed */

	if (!partial) {
@@ -290,9 +288,9 @@ static Indirect *find_shared(struct inode *inode, 
	*top = 0;

	for (k = depth; k > 1 && !offsets[k-1]; k--)

		;

	partial = get_branch(inode, k, offsets, chain, &err);



	write_lock(&pointers_lock);

	partial = get_branch(inode, k, offsets, chain, &err);

	if (!partial)

		partial = chain + k-1;

	/*