On Fri, 2021-10-08 at 14:09 +0000, Chuck Lever III wrote:
>
>
> > On Oct 7, 2021, at 7:32 PM, Dave Wysochanski <dwysocha@xxxxxxxxxx>
> > wrote:
> >
> > Convert to the new VM readahead() API which is the preferred API
> > to read multiple pages, and rename the NFSIOS_* counters and the
> > tracepoint as needed.
> >
> > Signed-off-by: Dave Wysochanski <dwysocha@xxxxxxxxxx>
> > ---
> > fs/nfs/file.c | 2 +-
> > fs/nfs/nfstrace.h | 2 +-
> > fs/nfs/read.c | 21 +++++++++++++++------
> > include/linux/nfs_fs.h | 3 +--
> > include/linux/nfs_iostat.h | 6 +++---
> > 5 files changed, 21 insertions(+), 13 deletions(-)
> >
> > diff --git a/fs/nfs/file.c b/fs/nfs/file.c
> > index 209dac208477..cc76d17fa97f 100644
> > --- a/fs/nfs/file.c
> > +++ b/fs/nfs/file.c
> > @@ -519,7 +519,7 @@ static void nfs_swap_deactivate(struct file
> > *file)
> >
> > const struct address_space_operations nfs_file_aops = {
> > .readpage = nfs_readpage,
> > - .readpages = nfs_readpages,
> > + .readahead = nfs_readahead,
> > .set_page_dirty = __set_page_dirty_nobuffers,
> > .writepage = nfs_writepage,
> > .writepages = nfs_writepages,
> > diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
> > index 78b0f649dd09..d2b2080765a6 100644
> > --- a/fs/nfs/nfstrace.h
> > +++ b/fs/nfs/nfstrace.h
> > @@ -915,7 +915,7 @@
> > )
> > );
> >
> > -TRACE_EVENT(nfs_aops_readpages,
> > +TRACE_EVENT(nfs_aops_readahead,
>
> In v2 and v3 of my patch, this tracepoint has already been
> renamed to nfs_aop_readahead.
Does that mean you're going to resend, Chuck? All I have is your v1..
--
Trond Myklebust
Linux NFS client maintainer, Hammerspace
trond.myklebust@xxxxxxxxxxxxxxx
