Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeca0881 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by Greg Kroah-Hartman
Browse files

btrfs: rename bitmap_set_bits() -> btrfs_bitmap_set_bits() 



commit 4ca532d64648d4776d15512caed3efea05ca7195 upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f5cbd78

fs/btrfs/free-space-cache.c

+4 −4
Original line number Diff line number Diff line
@@ -1732,7 +1732,7 @@ static 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,

static void btrfs_bitmap_set_bits(struct btrfs_free_space_ctl *ctl,

				  struct btrfs_free_space *info, u64 offset,

				  u64 bytes)

{
@@ -1991,7 +1991,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);



	/*

	 * We set some bytes, we have no idea what the max extent size is