Commit 1280d2d1 authored by Fanjun Kong's avatar Fanjun Kong Committed by David Sterba
Browse files

btrfs: use PAGE_ALIGNED instead of IS_ALIGNED 



The <linux/mm.h> already provides the PAGE_ALIGNED macro. Let's
use it instead of IS_ALIGNED and passing PAGE_SIZE directly.

Reviewed-by: default avatarMuchun Song <songmuchun@bytedance.com>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarFanjun Kong <bh1scw@gmail.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 31f37269

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -6206,7 +6206,7 @@ static int check_eb_alignment(struct btrfs_fs_info *fs_info, u64 start) 
		return -EINVAL;

	}

	if (fs_info->nodesize >= PAGE_SIZE &&

	    !IS_ALIGNED(start, PAGE_SIZE)) {

	    !PAGE_ALIGNED(start)) {

		btrfs_err(fs_info,

		"tree block is not page aligned, start %llu nodesize %u",

			  start, fs_info->nodesize);

fs/btrfs/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -560,8 +560,8 @@ static inline int inode_need_compress(struct btrfs_inode *inode, u64 start, 
	 * will unlock the full page.

	 */

	if (fs_info->sectorsize < PAGE_SIZE) {

		if (!IS_ALIGNED(start, PAGE_SIZE) ||

		    !IS_ALIGNED(end + 1, PAGE_SIZE))

		if (!PAGE_ALIGNED(start) ||

		    !PAGE_ALIGNED(end + 1))

			return 0;

	}
@@ -678,8 +678,8 @@ static noinline int compress_file_range(struct async_chunk *async_chunk) 
	 * Thus we must also check against @actual_end, not just @end.

	 */

	if (blocksize < PAGE_SIZE) {

		if (!IS_ALIGNED(start, PAGE_SIZE) ||

		    !IS_ALIGNED(round_up(actual_end, blocksize), PAGE_SIZE))

		if (!PAGE_ALIGNED(start) ||

		    !PAGE_ALIGNED(round_up(actual_end, blocksize)))

			goto cleanup_and_bail_uncompressed;

	}