diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-13 15:59:57 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-15 09:12:22 -0400 |
commit | 1f9453578f059d2651aa6c6b16756627fc9f2a74 (patch) | |
tree | 05d0b81eb0c191ce0e5fd770189e1649dab3b4d9 /fs/nfs/pnfs.c | |
parent | dce81290eed64d24493989bb7a08f9e20495e184 (diff) |
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/pnfs.c')
-rw-r--r-- | fs/nfs/pnfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 93c73299588d..38e5508555c6 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c | |||
@@ -1075,7 +1075,7 @@ pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *r | |||
1075 | GFP_KERNEL); | 1075 | GFP_KERNEL); |
1076 | /* If no lseg, fall back to read through mds */ | 1076 | /* If no lseg, fall back to read through mds */ |
1077 | if (pgio->pg_lseg == NULL) | 1077 | if (pgio->pg_lseg == NULL) |
1078 | nfs_pageio_init_read_mds(pgio, pgio->pg_inode); | 1078 | nfs_pageio_reset_read_mds(pgio); |
1079 | 1079 | ||
1080 | } | 1080 | } |
1081 | EXPORT_SYMBOL_GPL(pnfs_generic_pg_init_read); | 1081 | EXPORT_SYMBOL_GPL(pnfs_generic_pg_init_read); |
@@ -1093,7 +1093,7 @@ pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page * | |||
1093 | GFP_NOFS); | 1093 | GFP_NOFS); |
1094 | /* If no lseg, fall back to write through mds */ | 1094 | /* If no lseg, fall back to write through mds */ |
1095 | if (pgio->pg_lseg == NULL) | 1095 | if (pgio->pg_lseg == NULL) |
1096 | nfs_pageio_init_write_mds(pgio, pgio->pg_inode, pgio->pg_ioflags); | 1096 | nfs_pageio_reset_write_mds(pgio); |
1097 | } | 1097 | } |
1098 | EXPORT_SYMBOL_GPL(pnfs_generic_pg_init_write); | 1098 | EXPORT_SYMBOL_GPL(pnfs_generic_pg_init_write); |
1099 | 1099 | ||