summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2024-06-17 17:41:53 +0200
committerJan Kara <jack@suse.cz>2024-06-26 12:54:11 +0200
commit8037da38d33cd354deafc41eee62da0fbcb5135c (patch)
treeb7056b91de889404d6bf0b7986ce7d37167089bc
parenta90d4471146de21745980cba51ce88e7926bcc4f (diff)
downloadlwn-8037da38d33cd354deafc41eee62da0fbcb5135c.tar.gz
lwn-8037da38d33cd354deafc41eee62da0fbcb5135c.zip
udf: Drop load_block_bitmap() wrapper
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>
-rw-r--r--fs/udf/balloc.c23
1 files changed, 3 insertions, 20 deletions
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);