* [PATCH] btrfs: use PAGE_ALIGNED instead of IS_ALIGNED
@ 2022-05-26 14:35 bh1scw
2022-05-27 2:01 ` Muchun Song
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: bh1scw @ 2022-05-26 14:35 UTC (permalink / raw)
To: Chris Mason, Josef Bacik, David Sterba
Cc: linux-btrfs, linux-kernel, Muchun Song, Fanjun Kong
From: Fanjun Kong <bh1scw@gmail.com>
The <linux/mm.h> already provides the PAGE_ALIGNED macro. Let's
use this macro instead of IS_ALIGNED and passing PAGE_SIZE directly.
Signed-off-by: Fanjun Kong <bh1scw@gmail.com>
---
fs/btrfs/extent_io.c | 2 +-
fs/btrfs/inode.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 8f6b544ae616..1f9f31004d60 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -6201,7 +6201,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);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 81737eff92f3..0f6f62fa03c8 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -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;
}
--
2.36.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] btrfs: use PAGE_ALIGNED instead of IS_ALIGNED
2022-05-26 14:35 [PATCH] btrfs: use PAGE_ALIGNED instead of IS_ALIGNED bh1scw
@ 2022-05-27 2:01 ` Muchun Song
2022-05-27 5:15 ` Nikolay Borisov
2022-05-27 13:36 ` David Sterba
2 siblings, 0 replies; 4+ messages in thread
From: Muchun Song @ 2022-05-27 2:01 UTC (permalink / raw)
To: bh1scw; +Cc: Chris Mason, Josef Bacik, David Sterba, linux-btrfs, LKML
On Thu, May 26, 2022 at 10:36 PM <bh1scw@gmail.com> wrote:
>
> From: Fanjun Kong <bh1scw@gmail.com>
>
> The <linux/mm.h> already provides the PAGE_ALIGNED macro. Let's
> use this macro instead of IS_ALIGNED and passing PAGE_SIZE directly.
>
> Signed-off-by: Fanjun Kong <bh1scw@gmail.com>
Reviewed-by: Muchun Song <songmuchun@bytedance.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] btrfs: use PAGE_ALIGNED instead of IS_ALIGNED
2022-05-26 14:35 [PATCH] btrfs: use PAGE_ALIGNED instead of IS_ALIGNED bh1scw
2022-05-27 2:01 ` Muchun Song
@ 2022-05-27 5:15 ` Nikolay Borisov
2022-05-27 13:36 ` David Sterba
2 siblings, 0 replies; 4+ messages in thread
From: Nikolay Borisov @ 2022-05-27 5:15 UTC (permalink / raw)
To: bh1scw, Chris Mason, Josef Bacik, David Sterba
Cc: linux-btrfs, linux-kernel, Muchun Song
On 26.05.22 г. 17:35 ч., bh1scw@gmail.com wrote:
> From: Fanjun Kong <bh1scw@gmail.com>
>
> The <linux/mm.h> already provides the PAGE_ALIGNED macro. Let's
> use this macro instead of IS_ALIGNED and passing PAGE_SIZE directly.
>
> Signed-off-by: Fanjun Kong <bh1scw@gmail.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] btrfs: use PAGE_ALIGNED instead of IS_ALIGNED
2022-05-26 14:35 [PATCH] btrfs: use PAGE_ALIGNED instead of IS_ALIGNED bh1scw
2022-05-27 2:01 ` Muchun Song
2022-05-27 5:15 ` Nikolay Borisov
@ 2022-05-27 13:36 ` David Sterba
2 siblings, 0 replies; 4+ messages in thread
From: David Sterba @ 2022-05-27 13:36 UTC (permalink / raw)
To: bh1scw
Cc: Chris Mason, Josef Bacik, David Sterba, linux-btrfs,
linux-kernel, Muchun Song
On Thu, May 26, 2022 at 10:35:40PM +0800, bh1scw@gmail.com wrote:
> From: Fanjun Kong <bh1scw@gmail.com>
>
> The <linux/mm.h> already provides the PAGE_ALIGNED macro. Let's
> use this macro instead of IS_ALIGNED and passing PAGE_SIZE directly.
>
> Signed-off-by: Fanjun Kong <bh1scw@gmail.com>
Added to misc-next, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-27 13:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-26 14:35 [PATCH] btrfs: use PAGE_ALIGNED instead of IS_ALIGNED bh1scw
2022-05-27 2:01 ` Muchun Song
2022-05-27 5:15 ` Nikolay Borisov
2022-05-27 13:36 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).