Commit 4ca532d6 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by David S. Miller

btrfs: rename bitmap_set_bits() -> btrfs_bitmap_set_bits()

bitmap_set_bits() does not start with the FS' prefix and may collide
with a new generic helper one day. It operates with the FS-specific
types, so there's no change those two could do the same thing.
Just add the prefix to exclude such possible conflict.
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Acked-by: default avatarDavid Sterba <dsterba@suse.com>
Reviewed-by: default avatarYury Norov <yury.norov@gmail.com>
Signed-off-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f5ef510
...@@ -1911,9 +1911,9 @@ static inline void bitmap_clear_bits(struct btrfs_free_space_ctl *ctl, ...@@ -1911,9 +1911,9 @@ static inline void bitmap_clear_bits(struct btrfs_free_space_ctl *ctl,
ctl->free_space -= bytes; ctl->free_space -= bytes;
} }
static void bitmap_set_bits(struct btrfs_free_space_ctl *ctl, static void btrfs_bitmap_set_bits(struct btrfs_free_space_ctl *ctl,
struct btrfs_free_space *info, u64 offset, struct btrfs_free_space *info, u64 offset,
u64 bytes) u64 bytes)
{ {
unsigned long start, count, end; unsigned long start, count, end;
int extent_delta = 1; int extent_delta = 1;
...@@ -2249,7 +2249,7 @@ static u64 add_bytes_to_bitmap(struct btrfs_free_space_ctl *ctl, ...@@ -2249,7 +2249,7 @@ static u64 add_bytes_to_bitmap(struct btrfs_free_space_ctl *ctl,
bytes_to_set = min(end - offset, bytes); bytes_to_set = min(end - offset, bytes);
bitmap_set_bits(ctl, info, offset, bytes_to_set); btrfs_bitmap_set_bits(ctl, info, offset, bytes_to_set);
return bytes_to_set; return bytes_to_set;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment