aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/pnfs.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-04-16 09:07:21 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2014-05-28 17:48:38 -0400
commita20c93e3160e37ecccc738d8eef085c8507949ed (patch)
tree22f179b47930f42ae8e1a8ac12d70f1aeee1b071 /fs/nfs/pnfs.h
parent1b33809ea8c671ccbceeaaa8d842631b441bed54 (diff)
nfs: remove ->write_pageio_init from rpc ops
The write_pageio_init method is just a very convoluted way to grab the right nfs_pageio_ops vector. The vector to chose is not a choice of protocol version, but just a pNFS vs MDS I/O choice that can simply be done inside nfs_pageio_init_write based on the presence of a layout driver, and a new force_mds flag to the special case of falling back to MDS I/O on a pNFS-capable volume. Signed-off-by: Christoph Hellwig <hch@lst.de> Tested-by: Anna Schumaker <Anna.Schumaker@Netapp.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/pnfs.h')
-rw-r--r--fs/nfs/pnfs.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 023793909778..e9ac8fbaee3d 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -182,8 +182,6 @@ void pnfs_put_lseg(struct pnfs_layout_segment *lseg);
182 182
183void pnfs_pageio_init_read(struct nfs_pageio_descriptor *, struct inode *, 183void pnfs_pageio_init_read(struct nfs_pageio_descriptor *, struct inode *,
184 const struct nfs_pgio_completion_ops *); 184 const struct nfs_pgio_completion_ops *);
185void pnfs_pageio_init_write(struct nfs_pageio_descriptor *, struct inode *,
186 int, const struct nfs_pgio_completion_ops *);
187 185
188void set_pnfs_layoutdriver(struct nfs_server *, const struct nfs_fh *, u32); 186void set_pnfs_layoutdriver(struct nfs_server *, const struct nfs_fh *, u32);
189void unset_pnfs_layoutdriver(struct nfs_server *); 187void unset_pnfs_layoutdriver(struct nfs_server *);
@@ -467,12 +465,6 @@ static inline void pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, str
467 nfs_pageio_init_read(pgio, inode, compl_ops); 465 nfs_pageio_init_read(pgio, inode, compl_ops);
468} 466}
469 467
470static inline void pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode, int ioflags,
471 const struct nfs_pgio_completion_ops *compl_ops)
472{
473 nfs_pageio_init_write(pgio, inode, ioflags, compl_ops);
474}
475
476static inline int 468static inline int
477pnfs_commit_list(struct inode *inode, struct list_head *mds_pages, int how, 469pnfs_commit_list(struct inode *inode, struct list_head *mds_pages, int how,
478 struct nfs_commit_info *cinfo) 470 struct nfs_commit_info *cinfo)