Commit fdb1e121 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by David Sterba
Browse files

btrfs: use PAGE_ALIGNED instead of open-coding it 



When using a 'var & (PAGE_SIZE - 1)' construct one is checking for a page
alignment and thus should use the PAGE_ALIGNED() macro instead of
open-coding it.

Convert all open-coded occurrences of PAGE_ALIGNED().

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7073017a

fs/btrfs/check-integrity.c

+4 −4
Original line number Diff line number Diff line
@@ -1601,7 +1601,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, 
	BUG_ON(block_ctx->datav);

	BUG_ON(block_ctx->pagev);

	BUG_ON(block_ctx->mem_to_free);

	if (block_ctx->dev_bytenr & ((u64)PAGE_SIZE - 1)) {

	if (!PAGE_ALIGNED(block_ctx->dev_bytenr)) {

		pr_info("btrfsic: read_block() with unaligned bytenr %llu\n",

		       block_ctx->dev_bytenr);

		return -1;
@@ -1778,7 +1778,7 @@ again: 
				return;

			}

			is_metadata = 1;

			BUG_ON(BTRFS_SUPER_INFO_SIZE & (PAGE_SIZE - 1));

			BUG_ON(!PAGE_ALIGNED(BTRFS_SUPER_INFO_SIZE));

			processed_len = BTRFS_SUPER_INFO_SIZE;

			if (state->print_mask &

			    BTRFSIC_PRINT_MASK_TREE_BEFORE_SB_WRITE) {
@@ -2892,12 +2892,12 @@ int btrfsic_mount(struct btrfs_fs_info *fs_info, 
	struct list_head *dev_head = &fs_devices->devices;

	struct btrfs_device *device;



	if (fs_info->nodesize & ((u64)PAGE_SIZE - 1)) {

	if (!PAGE_ALIGNED(fs_info->nodesize)) {

		pr_info("btrfsic: cannot handle nodesize %d not being a multiple of PAGE_SIZE %ld!\n",

		       fs_info->nodesize, PAGE_SIZE);

		return -1;

	}

	if (fs_info->sectorsize & ((u64)PAGE_SIZE - 1)) {

	if (!PAGE_ALIGNED(fs_info->sectorsize)) {

		pr_info("btrfsic: cannot handle sectorsize %d not being a multiple of PAGE_SIZE %ld!\n",

		       fs_info->sectorsize, PAGE_SIZE);

		return -1;

fs/btrfs/compression.c

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start, 
	blk_status_t ret;

	int skip_sum = BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM;



	WARN_ON(start & ((u64)PAGE_SIZE - 1));

	WARN_ON(!PAGE_ALIGNED(start));

	cb = kmalloc(compressed_bio_size(fs_info, compressed_len), GFP_NOFS);

	if (!cb)

		return BLK_STS_RESOURCE;

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2039,7 +2039,7 @@ int btrfs_set_extent_delalloc(struct inode *inode, u64 start, u64 end, 
			      unsigned int extra_bits,

			      struct extent_state **cached_state, int dedupe)

{

	WARN_ON((end & (PAGE_SIZE - 1)) == 0);

	WARN_ON(PAGE_ALIGNED(end));

	return set_extent_delalloc(&BTRFS_I(inode)->io_tree, start, end,

				   extra_bits, cached_state);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE