Commit ce394a7f authored by Yushan Zhou's avatar Yushan Zhou Committed by David Sterba
Browse files

btrfs: use PAGE_{ALIGN, ALIGNED, ALIGN_DOWN} macro 



The header file linux/mm.h provides PAGE_ALIGN, PAGE_ALIGNED,
PAGE_ALIGN_DOWN macros. Use these macros to make code more
concise.

Signed-off-by: default avatarYushan Zhou <katrinzhou@tencent.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d31de378

fs/btrfs/compression.c

+1 −1
Original line number Diff line number Diff line
@@ -1609,7 +1609,7 @@ static void heuristic_collect_sample(struct inode *inode, u64 start, u64 end, 
	index_end = end >> PAGE_SHIFT;



	/* Don't miss unaligned end */

	if (!IS_ALIGNED(end, PAGE_SIZE))

	if (!PAGE_ALIGNED(end))

		index_end++;



	curr_sample_pos = 0;

fs/btrfs/defrag.c

+1 −1
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ static int defrag_collect_targets(struct btrfs_inode *inode, 
}



#define CLUSTER_SIZE	(SZ_256K)

static_assert(IS_ALIGNED(CLUSTER_SIZE, PAGE_SIZE));

static_assert(PAGE_ALIGNED(CLUSTER_SIZE));



/*

 * Defrag one contiguous target range.

fs/btrfs/inode.c

+2 −3
Original line number Diff line number Diff line
@@ -10995,9 +10995,8 @@ static int btrfs_add_swap_extent(struct swap_info_struct *sis, 
		return 0;



	max_pages = sis->max - bsi->nr_pages;

	first_ppage = ALIGN(bsi->block_start, PAGE_SIZE) >> PAGE_SHIFT;

	next_ppage = ALIGN_DOWN(bsi->block_start + bsi->block_len,

				PAGE_SIZE) >> PAGE_SHIFT;

	first_ppage = PAGE_ALIGN(bsi->block_start) >> PAGE_SHIFT;

	next_ppage = PAGE_ALIGN_DOWN(bsi->block_start + bsi->block_len) >> PAGE_SHIFT;



	if (first_ppage >= next_ppage)

		return 0;

fs/btrfs/lzo.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ int lzo_compress_pages(struct list_head *ws, struct address_space *mapping, 
		}



		/* Check if we have reached page boundary */

		if (IS_ALIGNED(cur_in, PAGE_SIZE)) {

		if (PAGE_ALIGNED(cur_in)) {

			put_page(page_in);

			page_in = NULL;

		}

fs/btrfs/relocation.c

+1 −1
Original line number Diff line number Diff line
@@ -2825,7 +2825,7 @@ static noinline_for_stack int prealloc_file_extent_cluster( 
	 *

	 * Here we have to manually invalidate the range (i_size, PAGE_END + 1).

	 */

	if (!IS_ALIGNED(i_size, PAGE_SIZE)) {

	if (!PAGE_ALIGNED(i_size)) {

		struct address_space *mapping = inode->vfs_inode.i_mapping;

		struct btrfs_fs_info *fs_info = inode->root->fs_info;

		const u32 sectorsize = fs_info->sectorsize;