hulk inclusion category: feature bugzilla: 189105, https://gitee.com/openeuler/kernel/issues/I7TN3J
--------------------------------
This patch introduce introduce flag argument for ext2_new_blocks(), and also introduce EXT2_ALLOC_NORESERVE flags.
Signed-off-by: Ye Bin yebin10@huawei.com --- fs/ext2/balloc.c | 3 ++- fs/ext2/ext2.h | 7 ++++++- fs/ext2/inode.c | 2 +- fs/ext2/xattr.c | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index e90c17f88654..c55f4d0f7cc1 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c @@ -1222,6 +1222,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 @@ -1231,7 +1232,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; diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h index 8cbcbff6817f..132556f72fbc 100644 --- a/fs/ext2/ext2.h +++ b/fs/ext2/ext2.h @@ -415,6 +415,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 */ @@ -740,7 +745,7 @@ static inline struct ext2_inode_info *EXT2_I(struct inode *inode) 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_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, diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 93881b0786ab..091d6a7ab3f0 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -418,7 +418,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;
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c index 30a4563f033b..4d66c25a62a6 100644 --- a/fs/ext2/xattr.c +++ b/fs/ext2/xattr.c @@ -670,7 +670,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh, EXT2_I(inode)->i_block_group); unsigned long count = 1; int block = ext2_new_blocks(inode, goal, &count, - &error); + &error, 0); if (error) goto cleanup; ea_idebug(inode, "creating block %d", block);