Message ID | 20240201122216.2634007-11-aleksander.lobakin@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | ice: add PFCP filter support | expand |
On Thu, Feb 01, 2024 at 01:22:05PM +0100, Alexander Lobakin wrote: > 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: Przemek Kitszel <przemyslaw.kitszel@intel.com> > Acked-by: David Sterba <dsterba@suse.com> > Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com> Reviewed-by: Yury Norov <yury.norov@gmail.com>
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index d372c7ce0e6b..47c979c3e67e 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -1913,9 +1913,9 @@ static inline void bitmap_clear_bits(struct btrfs_free_space_ctl *ctl, ctl->free_space -= bytes; } -static void bitmap_set_bits(struct btrfs_free_space_ctl *ctl, - struct btrfs_free_space *info, u64 offset, - u64 bytes) +static void btrfs_bitmap_set_bits(struct btrfs_free_space_ctl *ctl, + struct btrfs_free_space *info, u64 offset, + u64 bytes) { unsigned long start, count, end; int extent_delta = 1; @@ -2251,7 +2251,7 @@ static u64 add_bytes_to_bitmap(struct btrfs_free_space_ctl *ctl, 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;