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

Commit 6faa8f47 authored by Howard McLauchlan's avatar Howard McLauchlan Committed by David Sterba
Browse files

btrfs: clean up le_bitmap_{set, clear}() 



le_bitmap_set() is only used by free-space-tree, so move it there and
make it static. le_bitmap_clear() is not used, so remove it.

Signed-off-by: default avatarHoward McLauchlan <hmclauchlan@fb.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f46b24c9

fs/btrfs/extent_io.c

+0 −40
Original line number Diff line number Diff line
@@ -5620,46 +5620,6 @@ void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src, 
	}

}



void le_bitmap_set(u8 *map, unsigned int start, int len)

{

	u8 *p = map + BIT_BYTE(start);

	const unsigned int size = start + len;

	int bits_to_set = BITS_PER_BYTE - (start % BITS_PER_BYTE);

	u8 mask_to_set = BITMAP_FIRST_BYTE_MASK(start);



	while (len - bits_to_set >= 0) {

		*p |= mask_to_set;

		len -= bits_to_set;

		bits_to_set = BITS_PER_BYTE;

		mask_to_set = ~0;

		p++;

	}

	if (len) {

		mask_to_set &= BITMAP_LAST_BYTE_MASK(size);

		*p |= mask_to_set;

	}

}



void le_bitmap_clear(u8 *map, unsigned int start, int len)

{

	u8 *p = map + BIT_BYTE(start);

	const unsigned int size = start + len;

	int bits_to_clear = BITS_PER_BYTE - (start % BITS_PER_BYTE);

	u8 mask_to_clear = BITMAP_FIRST_BYTE_MASK(start);



	while (len - bits_to_clear >= 0) {

		*p &= ~mask_to_clear;

		len -= bits_to_clear;

		bits_to_clear = BITS_PER_BYTE;

		mask_to_clear = ~0;

		p++;

	}

	if (len) {

		mask_to_clear &= BITMAP_LAST_BYTE_MASK(size);

		*p &= ~mask_to_clear;

	}

}



/*

 * eb_bitmap_offset() - calculate the page and offset of the byte containing the

 * given bit number

fs/btrfs/extent_io.h

+0 −3
Original line number Diff line number Diff line
@@ -84,9 +84,6 @@ static inline int le_test_bit(int nr, const u8 *addr) 
	return 1U & (addr[BIT_BYTE(nr)] >> (nr & (BITS_PER_BYTE-1)));

}



void le_bitmap_set(u8 *map, unsigned int start, int len);

void le_bitmap_clear(u8 *map, unsigned int start, int len);



struct extent_state;

struct btrfs_root;

struct btrfs_inode;

fs/btrfs/free-space-tree.c

+20 −0
Original line number Diff line number Diff line
@@ -157,6 +157,26 @@ static u8 *alloc_bitmap(u32 bitmap_size) 
	return ret;

}



static void le_bitmap_set(u8 *map, unsigned int start, int len)

{

	u8 *p = map + BIT_BYTE(start);

	const unsigned int size = start + len;

	int bits_to_set = BITS_PER_BYTE - (start % BITS_PER_BYTE);

	u8 mask_to_set = BITMAP_FIRST_BYTE_MASK(start);



	while (len - bits_to_set >= 0) {

		*p |= mask_to_set;

		len -= bits_to_set;

		bits_to_set = BITS_PER_BYTE;

		mask_to_set = ~0;

		p++;

	}

	if (len) {

		mask_to_set &= BITMAP_LAST_BYTE_MASK(size);

		*p |= mask_to_set;

	}

}



int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,

				  struct btrfs_fs_info *fs_info,

				  struct btrfs_block_group_cache *block_group,