diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-01-22 21:54:52 +0100 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2022-02-25 21:07:07 +0100 |
| commit | 8786fde8421ce755a842051f9528674a1b1f0b9a (patch) | |
| tree | 1052211ef0a255524ad285c1c1648ad95b1b0d93 /fs/nfs/nfstrace.h | |
| parent | NFS: simplify check for freeing cn_resp (diff) | |
| download | linux-8786fde8421ce755a842051f9528674a1b1f0b9a.tar.xz linux-8786fde8421ce755a842051f9528674a1b1f0b9a.zip | |
Convert NFS from readpages to readahead
NFS is one of the last two users of the deprecated ->readpages aop.
This conversion looks straightforward, but I have only compile-tested
it.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs/nfstrace.h')
| -rw-r--r-- | fs/nfs/nfstrace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h index 317ce27bdc4b..4611aa3a21a4 100644 --- a/fs/nfs/nfstrace.h +++ b/fs/nfs/nfstrace.h @@ -889,11 +889,11 @@ TRACE_EVENT(nfs_aop_readpage_done, TRACE_EVENT(nfs_aop_readahead, TP_PROTO( const struct inode *inode, - struct page *page, + loff_t pos, unsigned int nr_pages ), - TP_ARGS(inode, page, nr_pages), + TP_ARGS(inode, pos, nr_pages), TP_STRUCT__entry( __field(dev_t, dev) @@ -911,7 +911,7 @@ TRACE_EVENT(nfs_aop_readahead, __entry->fileid = nfsi->fileid; __entry->fhandle = nfs_fhandle_hash(&nfsi->fh); __entry->version = inode_peek_iversion_raw(inode); - __entry->offset = page_index(page) << PAGE_SHIFT; + __entry->offset = pos; __entry->nr_pages = nr_pages; ), |