[3/3] udf: Drop load_block_bitmap() wrapper

Commit Message

Jan Kara June 17, 2024, 3:41 p.m. UTC

The wrapper is completely pointless as all the checks are already done
in __load_block_bitmap(). Just drop it and rename __load_block_bitmap().

Signed-off-by: Jan Kara <[e-mail]>
---
 fs/udf/balloc.c | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

Patch

diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 558ad046972a..a76490b2ca19 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -73,9 +73,9 @@  static int read_block_bitmap(struct super_block *sb,
 	return 0;
 }
 
-static int __load_block_bitmap(struct super_block *sb,
-			       struct udf_bitmap *bitmap,
-			       unsigned int block_group)
+static int load_block_bitmap(struct super_block *sb,
+			     struct udf_bitmap *bitmap,
+			     unsigned int block_group)
 {
 	int retval = 0;
 	int nr_groups = bitmap->s_nr_groups;
@@ -102,23 +102,6 @@  static int __load_block_bitmap(struct super_block *sb,
 	return block_group;
 }
 
-static inline int load_block_bitmap(struct super_block *sb,
-				    struct udf_bitmap *bitmap,
-				    unsigned int block_group)
-{
-	int slot;
-
-	slot = __load_block_bitmap(sb, bitmap, block_group);
-
-	if (slot < 0)
-		return slot;
-
-	if (!bitmap->s_block_bitmap[slot])
-		return -EIO;
-
-	return slot;
-}
-
 static void udf_add_free_space(struct super_block *sb, u16 partition, u32 cnt)
 {
 	struct udf_sb_info *sbi = UDF_SB(sb);