summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4filelayout.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2011-07-13 15:59:57 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2011-07-15 09:12:22 -0400
commit1f9453578f059d2651aa6c6b16756627fc9f2a74 (patch)
tree05d0b81eb0c191ce0e5fd770189e1649dab3b4d9 /fs/nfs/nfs4filelayout.c
parentdce81290eed64d24493989bb7a08f9e20495e184 (diff)
downloadop-kernel-dev-1f9453578f059d2651aa6c6b16756627fc9f2a74.zip
op-kernel-dev-1f9453578f059d2651aa6c6b16756627fc9f2a74.tar.gz
NFS: Clean up - simplify the switch to read/write-through-MDS
Use nfs_pageio_reset_read_mds and nfs_pageio_reset_write_mds instead of completely reinitialising the struct nfs_pageio_descriptor. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4filelayout.c')
-rw-r--r--fs/nfs/nfs4filelayout.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index fbc5b42..f0b37e1 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -711,7 +711,7 @@ filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio,
GFP_KERNEL);
/* If no lseg, fall back to read through mds */
if (pgio->pg_lseg == NULL)
- nfs_pageio_init_read_mds(pgio, pgio->pg_inode);
+ nfs_pageio_reset_read_mds(pgio);
}
void
@@ -728,8 +728,7 @@ filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio,
GFP_NOFS);
/* If no lseg, fall back to write through mds */
if (pgio->pg_lseg == NULL)
- nfs_pageio_init_write_mds(pgio, pgio->pg_inode,
- pgio->pg_ioflags);
+ nfs_pageio_reset_write_mds(pgio);
}
static const struct nfs_pageio_ops filelayout_pg_read_ops = {
OpenPOWER on IntegriCloud