| Message ID | 20230328112716.50120-3-p.raghav@samsung.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | remove page_endio() | expand |
On Tue, Mar 28, 2023 at 01:27:13PM +0200, Pankaj Raghav wrote: > Convert orangefs_readahead() from using struct page to struct folio. > This conversion removes the call to page_endio() which is soon to be > removed, and simplifies the final page handling. > > The page error flags is not required to be set in the error case as > orangefs doesn't depend on them. > > Signed-off-by: Pankaj Raghav <p.raghav@samsung.com> Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org> Shouldn't Mike's tested-by be in here?
On 2023-03-28 17:21, Matthew Wilcox wrote: > On Tue, Mar 28, 2023 at 01:27:13PM +0200, Pankaj Raghav wrote: >> Convert orangefs_readahead() from using struct page to struct folio. >> This conversion removes the call to page_endio() which is soon to be >> removed, and simplifies the final page handling. >> >> The page error flags is not required to be set in the error case as >> orangefs doesn't depend on them. >> >> Signed-off-by: Pankaj Raghav <p.raghav@samsung.com> > > Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org> > > Shouldn't Mike's tested-by be in here? I mentioned that he tested in my cover letter as I didn't receive a Tested-by tag from him.
I thought telling you that I tested it was good :-) ... Please do put a tested-by me in there... -Mike On Tue, Mar 28, 2023 at 12:02 PM Pankaj Raghav <p.raghav@samsung.com> wrote: > > On 2023-03-28 17:21, Matthew Wilcox wrote: > > On Tue, Mar 28, 2023 at 01:27:13PM +0200, Pankaj Raghav wrote: > >> Convert orangefs_readahead() from using struct page to struct folio. > >> This conversion removes the call to page_endio() which is soon to be > >> removed, and simplifies the final page handling. > >> > >> The page error flags is not required to be set in the error case as > >> orangefs doesn't depend on them. > >> > >> Signed-off-by: Pankaj Raghav <p.raghav@samsung.com> > > > > Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org> > > > > Shouldn't Mike's tested-by be in here? > > I mentioned that he tested in my cover letter as I didn't receive a Tested-by > tag from him.
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c index aefdf1d3be7c..9014bbcc8031 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -244,7 +244,7 @@ static void orangefs_readahead(struct readahead_control *rac) struct iov_iter iter; struct inode *inode = rac->mapping->host; struct xarray *i_pages; - struct page *page; + struct folio *folio; loff_t new_start = readahead_pos(rac); int ret; size_t new_len = 0; @@ -275,9 +275,10 @@ static void orangefs_readahead(struct readahead_control *rac) ret = 0; /* clean up. */ - while ((page = readahead_page(rac))) { - page_endio(page, false, ret); - put_page(page); + while ((folio = readahead_folio(rac))) { + if (!ret) + folio_mark_uptodate(folio); + folio_unlock(folio); } }
Convert orangefs_readahead() from using struct page to struct folio. This conversion removes the call to page_endio() which is soon to be removed, and simplifies the final page handling. The page error flags is not required to be set in the error case as orangefs doesn't depend on them. Signed-off-by: Pankaj Raghav <p.raghav@samsung.com> --- fs/orangefs/inode.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)