diff options
| author |  Olga Kornievskaia <kolga@netapp.com>
| 2024-05-10 15:07:43 -0400 |
|---|---|---|
| committer |  Trond Myklebust <trond.myklebust@hammerspace.com>
| 2024-05-21 08:34:15 -0400 |
| commit | a01b077a8743b2ed329c587cf4bbe49682da243f (patch) | |
| tree | 91ad031373204393538bc8452a6588cd147ea297 /fs/nfs/filelayout | |
| parent | pNFS/filelayout: check layout segment range (diff) | |
| download | linux-a01b077a8743b2ed329c587cf4bbe49682da243f.tar.gz linux-a01b077a8743b2ed329c587cf4bbe49682da243f.tar.bz2 linux-a01b077a8743b2ed329c587cf4bbe49682da243f.zip | |
pNFS: rework pnfs_generic_pg_check_layout to check IO range
All callers of pnfs_generic_pg_check_layout() also want to do a call to
check that the layout's range covers the IO range. Merge the functionality
of the pnfs_generic_pg_check_range() into that of
pnfs_generic_pg_check_layout().
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Diffstat (limited to 'fs/nfs/filelayout')
| -rw-r--r-- | fs/nfs/filelayout/filelayout.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c index bf3ba2e98f33..29d84dc66ca3 100644 --- a/fs/nfs/filelayout/filelayout.c +++ b/fs/nfs/filelayout/filelayout.c @@ -867,8 +867,7 @@ static void filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req) { - pnfs_generic_pg_check_layout(pgio); - pnfs_generic_pg_check_range(pgio, req); + pnfs_generic_pg_check_layout(pgio, req); if (!pgio->pg_lseg) { pgio->pg_lseg = fl_pnfs_update_layout(pgio->pg_inode, nfs_req_openctx(req), @@ -892,8 +891,7 @@ static void filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page *req) { - pnfs_generic_pg_check_layout(pgio); - pnfs_generic_pg_check_range(pgio, req); + pnfs_generic_pg_check_layout(pgio, req); if (!pgio->pg_lseg) { pgio->pg_lseg = fl_pnfs_update_layout(pgio->pg_inode, nfs_req_openctx(req), |