NFS: Create a common pgio_rpc_prepare function

The read and write paths do exactly the same thing for the rpc_prepare
rpc_op.  This patch combines them together into a single function.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 594812546c25..da00a4d6f470 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -53,8 +53,10 @@ struct nfs_pageio_ops {
 };
 
 struct nfs_rw_ops {
+        const fmode_t rw_mode;
         struct nfs_rw_header *(*rw_alloc_header)(void);
         void (*rw_free_header)(struct nfs_rw_header *);
+        void (*rw_release)(struct nfs_pgio_data *);
 };
 
 struct nfs_pageio_descriptor {
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index a1b91b67145e..adef7bd2d06d 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1429,11 +1429,10 @@ struct nfs_rpc_ops {
                              struct nfs_pathconf *);
         int     (*set_capabilities)(struct nfs_server *, struct nfs_fh *);
         int     (*decode_dirent)(struct xdr_stream *, struct nfs_entry *, int);
+        int     (*pgio_rpc_prepare)(struct rpc_task *, struct nfs_pgio_data *);
         void    (*read_setup)   (struct nfs_pgio_data *, struct rpc_message *);
-        int     (*read_rpc_prepare)(struct rpc_task *, struct nfs_pgio_data *);
         int     (*read_done)  (struct rpc_task *, struct nfs_pgio_data *);
         void    (*write_setup)  (struct nfs_pgio_data *, struct rpc_message *);
-        int     (*write_rpc_prepare)(struct rpc_task *, struct nfs_pgio_data *);
         int     (*write_done)  (struct rpc_task *, struct nfs_pgio_data *);
         void    (*commit_setup) (struct nfs_commit_data *, struct rpc_message *);
         void    (*commit_rpc_prepare)(struct rpc_task *, struct nfs_commit_data *);