| Message ID | 20241205171653.3179945-24-willy@infradead.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Convert ocfs2 to use folios | expand |
On 2024/12/6 01:16, Matthew Wilcox (Oracle) wrote: > From: Mark Tinguely <mark.tinguely@oracle.com> > > Remove assumptions that a folio is PAGE_SIZE. > > Signed-off-by: Mark Tinguely <mark.tinguely@oracle.com> > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Looks good. Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com> > --- > fs/ocfs2/file.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c > index 957ced628eb1..e54f2c4b5a90 100644 > --- a/fs/ocfs2/file.c > +++ b/fs/ocfs2/file.c > @@ -782,11 +782,11 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from, > goto out_commit_trans; > } > > - /* Get the offsets within the page that we want to zero */ > - zero_from = abs_from & (PAGE_SIZE - 1); > - zero_to = abs_to & (PAGE_SIZE - 1); > + /* Get the offsets within the folio that we want to zero */ > + zero_from = offset_in_folio(folio, abs_from); > + zero_to = offset_in_folio(folio, abs_to); > if (!zero_to) > - zero_to = PAGE_SIZE; > + zero_to = folio_size(folio); > > trace_ocfs2_write_zero_page( > (unsigned long long)OCFS2_I(inode)->ip_blkno,
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 957ced628eb1..e54f2c4b5a90 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -782,11 +782,11 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from, goto out_commit_trans; } - /* Get the offsets within the page that we want to zero */ - zero_from = abs_from & (PAGE_SIZE - 1); - zero_to = abs_to & (PAGE_SIZE - 1); + /* Get the offsets within the folio that we want to zero */ + zero_from = offset_in_folio(folio, abs_from); + zero_to = offset_in_folio(folio, abs_to); if (!zero_to) - zero_to = PAGE_SIZE; + zero_to = folio_size(folio); trace_ocfs2_write_zero_page( (unsigned long long)OCFS2_I(inode)->ip_blkno,