Commit e9c59a3c authored Sep 04, 2023 by Ye Bin

ext2: remove ext2_new_block()

hulk inclusion
category: feature
bugzilla: 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>

parent 800a6b44

fs/ext2/balloc.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -1431,13 +1431,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

+0 −1

Original line number	Diff line number	Diff line
		@@ -718,7 +718,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,

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);
		if (error)
		goto cleanup;
		ea_idebug(inode, "creating block %d", block);