| Message ID | d6eadb090334ea49ceef4e643b371fabfcea328f.1709182251.git.ritesh.list@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] ext4: Fixes len calculation in mpage_journal_page_buffers | expand |
On Thu 29-02-24 11:40:14, Ritesh Harjani (IBM) wrote: > This patch simply removes the PAGE_MASK dependency since > mpage_submit_folio() is already converted to work with folio. > > Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/ext4/inode.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index bab9223d94ac..e8b0773e5d2d 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -1865,7 +1865,7 @@ static int mpage_submit_folio(struct mpage_da_data *mpd, struct folio *folio) > len = folio_size(folio); > if (folio_pos(folio) + len > size && > !ext4_verity_in_progress(mpd->inode)) > - len = size & ~PAGE_MASK; > + len = size & (len - 1); > err = ext4_bio_write_folio(&mpd->io_submit, folio, len); > if (!err) > mpd->wbc->nr_to_write--; > -- > 2.39.2 >
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index bab9223d94ac..e8b0773e5d2d 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1865,7 +1865,7 @@ static int mpage_submit_folio(struct mpage_da_data *mpd, struct folio *folio) len = folio_size(folio); if (folio_pos(folio) + len > size && !ext4_verity_in_progress(mpd->inode)) - len = size & ~PAGE_MASK; + len = size & (len - 1); err = ext4_bio_write_folio(&mpd->io_submit, folio, len); if (!err) mpd->wbc->nr_to_write--;
This patch simply removes the PAGE_MASK dependency since mpage_submit_folio() is already converted to work with folio. Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> --- fs/ext4/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)