diff mbox series

[v2,1/4] ext2: remove ext2_new_block()

Message ID 20230815112612.221145-2-yebin10@huawei.com
State New
Headers
Series ext2: fix race between setxattr and write back |

Commit Message

Ye Bin Aug. 15, 2023, 11:26 a.m. UTC 
  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 mbox series

Patch

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index c8049c90323d..c8515fc501ec 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -1429,13 +1429,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 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 1c9187188d68..e9546cc65db2 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);
-			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);