mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 14:44:12 +00:00
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: Muchun Song <songmuchun@bytedance.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: Fanjun Kong <bh1scw@gmail.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
31f3726980
commit
1280d2d165
2 changed files with 5 additions and 5 deletions
|
@ -6206,7 +6206,7 @@ static int check_eb_alignment(struct btrfs_fs_info *fs_info, u64 start)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
if (fs_info->nodesize >= PAGE_SIZE &&
|
if (fs_info->nodesize >= PAGE_SIZE &&
|
||||||
!IS_ALIGNED(start, PAGE_SIZE)) {
|
!PAGE_ALIGNED(start)) {
|
||||||
btrfs_err(fs_info,
|
btrfs_err(fs_info,
|
||||||
"tree block is not page aligned, start %llu nodesize %u",
|
"tree block is not page aligned, start %llu nodesize %u",
|
||||||
start, fs_info->nodesize);
|
start, fs_info->nodesize);
|
||||||
|
|
|
@ -560,8 +560,8 @@ static inline int inode_need_compress(struct btrfs_inode *inode, u64 start,
|
||||||
* will unlock the full page.
|
* will unlock the full page.
|
||||||
*/
|
*/
|
||||||
if (fs_info->sectorsize < PAGE_SIZE) {
|
if (fs_info->sectorsize < PAGE_SIZE) {
|
||||||
if (!IS_ALIGNED(start, PAGE_SIZE) ||
|
if (!PAGE_ALIGNED(start) ||
|
||||||
!IS_ALIGNED(end + 1, PAGE_SIZE))
|
!PAGE_ALIGNED(end + 1))
|
||||||
return 0;
|
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.
|
* Thus we must also check against @actual_end, not just @end.
|
||||||
*/
|
*/
|
||||||
if (blocksize < PAGE_SIZE) {
|
if (blocksize < PAGE_SIZE) {
|
||||||
if (!IS_ALIGNED(start, PAGE_SIZE) ||
|
if (!PAGE_ALIGNED(start) ||
|
||||||
!IS_ALIGNED(round_up(actual_end, blocksize), PAGE_SIZE))
|
!PAGE_ALIGNED(round_up(actual_end, blocksize)))
|
||||||
goto cleanup_and_bail_uncompressed;
|
goto cleanup_and_bail_uncompressed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue