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

!1977 fix race between setxattr and write back 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ye Bin <yebin10@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/75OMCOHOXVXA66ERH54BBMR3W5RJMTAW/ 
Ye Bin (4):
  ext2: remove ext2_new_block()
  ext2: introduce flag argument for ext2_new_blocks()
  ext2: fix race between setxattr and write back
  ext2: dump current reservation window info


-- 
2.31.1
 
https://gitee.com/openeuler/kernel/issues/I7TN3J 
 
Link:https://gitee.com/openeuler/kernel/pulls/1977

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f5d546f4 56beaef9

fs/ext2/balloc.c

+17 −15
Original line number Diff line number Diff line
@@ -1133,8 +1133,13 @@ ext2_try_to_allocate_with_rsv(struct super_block *sb, unsigned int group, 


		if ((my_rsv->rsv_start > group_last_block) ||

				(my_rsv->rsv_end < group_first_block)) {

			ext2_error(sb, __func__,

				   "Reservation out of group %u range goal %d fsb[%lu,%lu] rsv[%lu, %lu]",

				   group, grp_goal, group_first_block,

				   group_last_block, my_rsv->rsv_start,

				   my_rsv->rsv_end);

			rsv_window_dump(&EXT2_SB(sb)->s_rsv_window_root, 1);

			BUG();

			return -1;

		}

		ret = ext2_try_to_allocate(sb, group, bitmap_bh, grp_goal,

					   &num, &my_rsv->rsv_window);
@@ -1195,6 +1200,7 @@ int ext2_data_block_valid(struct ext2_sb_info *sbi, ext2_fsblk_t start_blk, 
 * @goal:		given target block(filesystem wide)

 * @count:		target number of blocks to allocate

 * @errp:		error code

 * @flag                allocate flags

 *

 * ext2_new_blocks uses a goal block to assist allocation.  If the goal is

 * free, or there is a free block within 32 blocks of the goal, that block
@@ -1204,7 +1210,7 @@ int ext2_data_block_valid(struct ext2_sb_info *sbi, ext2_fsblk_t start_blk, 
 * This function also updates quota and i_blocks field.

 */

ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal,

		    unsigned long *count, int *errp)

		    unsigned long *count, int *errp, unsigned int flag)

{

	struct buffer_head *bitmap_bh = NULL;

	struct buffer_head *gdp_bh;
@@ -1248,14 +1254,17 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal, 
	 * it's a regular file, and

	 * the desired window size is greater than 0 (One could use ioctl

	 * command EXT2_IOC_SETRSVSZ to set the window size to 0 to turn off

	 * reservation on that particular file)

	 * reservation on that particular file), and unspecified Do not use

	 * reservation window.

	 */

	if (!(flag & EXT2_ALLOC_NORESERVE)) {

		block_i = EXT2_I(inode)->i_block_alloc_info;

		if (block_i) {

			windowsz = block_i->rsv_window_node.rsv_goal_size;

			if (windowsz > 0)

				my_rsv = &block_i->rsv_window_node;

		}

	}



	if (!ext2_has_free_blocks(sbi)) {

		*errp = -ENOSPC;
@@ -1431,13 +1440,6 @@ ext2_fsblk_t ext2_new_blocks(struct inode *inode, ext2_fsblk_t goal, 
	return 0;

}



ext2_fsblk_t ext2_new_block(struct inode *inode, unsigned long goal, int *errp)

{

	unsigned long count = 1;



	return ext2_new_blocks(inode, goal, &count, errp);

}



#ifdef EXT2FS_DEBUG



unsigned long ext2_count_free(struct buffer_head *map, unsigned int numchars)

fs/ext2/ext2.h

+6 −2
Original line number Diff line number Diff line
@@ -410,6 +410,11 @@ struct ext2_inode { 
#define EXT2_ERRORS_PANIC		3	/* Panic */

#define EXT2_ERRORS_DEFAULT		EXT2_ERRORS_CONTINUE



/*

 * Behaviour if use reservation window in ext2_new_blocks()

 */

#define EXT2_ALLOC_NORESERVE            0x1



/*

 * Structure of the super block

 */
@@ -718,9 +723,8 @@ static inline struct ext2_inode_info *EXT2_I(struct inode *inode) 
/* balloc.c */

extern int ext2_bg_has_super(struct super_block *sb, int group);

extern unsigned long ext2_bg_num_gdb(struct super_block *sb, int group);

extern ext2_fsblk_t ext2_new_block(struct inode *, unsigned long, int *);

extern ext2_fsblk_t ext2_new_blocks(struct inode *, unsigned long,

				unsigned long *, int *);

				unsigned long *, int *, unsigned int);

extern int ext2_data_block_valid(struct ext2_sb_info *sbi, ext2_fsblk_t start_blk,

				 unsigned int count);

extern void ext2_free_blocks (struct inode *, unsigned long,

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static int ext2_alloc_blocks(struct inode *inode, 
	while (1) {

		count = target;

		/* allocating blocks for indirect blocks and direct blocks */

		current_block = ext2_new_blocks(inode,goal,&count,err);

		current_block = ext2_new_blocks(inode, goal, &count, err, 0);

		if (*err)

			goto failed_out;

fs/ext2/xattr.c

+3 −1
Original line number Diff line number Diff line
@@ -694,7 +694,9 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, 
			/* We need to allocate a new block */

			ext2_fsblk_t goal = ext2_group_first_block_no(sb,

						EXT2_I(inode)->i_block_group);

			int block = ext2_new_block(inode, goal, &error);

			unsigned long count = 1;

			int block = ext2_new_blocks(inode, goal, &count, &error,

						    EXT2_ALLOC_NORESERVE);

			if (error)

				goto cleanup;

			ea_idebug(inode, "creating block %d", block);