diff options
| author | Ye Bin <yebin10@huawei.com> | 2023-08-15 13:26:09 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2023-08-16 17:35:08 +0200 |
| commit | 2445a8a1922b46c56189203f7fdc1e1cb2a47cdd (patch) | |
| tree | ef3ed45d1299a96c39d76eb8b9afce1cc5b2dd24 /fs/ext2 | |
| parent | ext2: fix datatype of block number in ext2_xattr_set2() (diff) | |
| download | linux-2445a8a1922b46c56189203f7fdc1e1cb2a47cdd.tar.xz linux-2445a8a1922b46c56189203f7fdc1e1cb2a47cdd.zip | |
ext2: remove ext2_new_block()
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>
Message-Id: <20230815112612.221145-2-yebin10@huawei.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/balloc.c | 7 | ||||
| -rw-r--r-- | fs/ext2/ext2.h | 1 | ||||
| -rw-r--r-- | 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 eca60b747c6b..ddaa823fc7f5 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c @@ -1431,13 +1431,6 @@ out: 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 35a041c47c38..954fb82ab22c 100644 --- a/fs/ext2/ext2.h +++ b/fs/ext2/ext2.h @@ -695,7 +695,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 89517937d36c..06933eabac26 100644 --- a/fs/ext2/xattr.c +++ b/fs/ext2/xattr.c @@ -742,7 +742,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); - ext2_fsblk_t block = ext2_new_block(inode, goal, &error); + unsigned long count = 1; + ext2_fsblk_t block = ext2_new_blocks(inode, goal, + &count, &error); if (error) goto cleanup; ea_idebug(inode, "creating block %lu", block); |