hulk inclusion category: feature bugzilla: 189105, https://gitee.com/openeuler/kernel/issues/I7TN3J
--------------------------------
Now, only xattr allocate block use ext2_new_block(), so just opencode it in the xattr code.
Signed-off-by: Ye Bin yebin10@huawei.com --- fs/ext2/balloc.c | 7 ------- fs/ext2/ext2.h | 1 - fs/ext2/xattr.c | 4 +++- 3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index 33db13365c5e..e90c17f88654 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c @@ -1450,13 +1450,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) diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h index 1ffdf80f05ff..8cbcbff6817f 100644 --- a/fs/ext2/ext2.h +++ b/fs/ext2/ext2.h @@ -739,7 +739,6 @@ 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 *); extern int ext2_data_block_valid(struct ext2_sb_info *sbi, ext2_fsblk_t start_blk, diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c index b1c361e24a30..30a4563f033b 100644 --- a/fs/ext2/xattr.c +++ b/fs/ext2/xattr.c @@ -668,7 +668,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); if (error) goto cleanup; ea_idebug(inode, "creating block %d", block);