]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
udf: Drop load_block_bitmap() wrapper
authorJan Kara <jack@suse.cz>
Mon, 17 Jun 2024 15:41:53 +0000 (17:41 +0200)
committerJan Kara <jack@suse.cz>
Wed, 26 Jun 2024 10:54:11 +0000 (12:54 +0200)
The wrapper is completely pointless as all the checks are already done
in __load_block_bitmap(). Just drop it and rename __load_block_bitmap().

Link: https://patch.msgid.link/20240617154201.29512-3-jack@suse.cz
Signed-off-by: Jan Kara <jack@suse.cz>
fs/udf/balloc.c

index 558ad046972ad53c7a48a69c51f46e03869e3411..a76490b2ca19c872e71f70b552b4fb8152077f13 100644 (file)
@@ -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);