tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Acked-by: David Sterba <dsterba@suse.com>
Reviewed-by: Yury Norov <yury.norov@gmail.com>
Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Alexander Lobakin and committed by
David S. Miller 4ca532d6 3f5ef510

+4 -4
+4 -4
fs/btrfs/free-space-cache.c
··· 1911 1911 ctl->free_space -= bytes; 1912 1912 } 1913 1913 1914 - static void bitmap_set_bits(struct btrfs_free_space_ctl *ctl, 1915 - struct btrfs_free_space *info, u64 offset, 1916 - u64 bytes) 1914 + static void btrfs_bitmap_set_bits(struct btrfs_free_space_ctl *ctl, 1915 + struct btrfs_free_space *info, u64 offset, 1916 + u64 bytes) 1917 1917 { 1918 1918 unsigned long start, count, end; 1919 1919 int extent_delta = 1; ··· 2249 2249 2250 2250 bytes_to_set = min(end - offset, bytes); 2251 2251 2252 - bitmap_set_bits(ctl, info, offset, bytes_to_set); 2252 + btrfs_bitmap_set_bits(ctl, info, offset, bytes_to_set); 2253 2253 2254 2254 return bytes_to_set; 2255 2255