1 files changed, 14 insertions, 5 deletions

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 467c84efb596..38d96ba935c2 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -285,6 +285,7 @@ struct nfs4_layoutcommit_data {
         struct nfs_fattr fattr;
         struct list_head lseg_list;
         struct rpc_cred *cred;
+        struct inode *inode;
         struct nfs4_layoutcommit_args args;
         struct nfs4_layoutcommit_res res;
 };
@@ -293,6 +294,7 @@ struct nfs4_layoutreturn_args {
         struct nfs4_sequence_args seq_args;
         struct pnfs_layout_hdr *layout;
         struct inode *inode;
+        struct pnfs_layout_range range;
         nfs4_stateid stateid;
         __u32   layout_type;
 };
@@ -308,6 +310,7 @@ struct nfs4_layoutreturn {
         struct nfs4_layoutreturn_res res;
         struct rpc_cred *cred;
         struct nfs_client *clp;
+        struct inode *inode;
         int rpc_status;
 };
 
@@ -325,6 +328,7 @@ struct nfs_openargs {
         struct nfs_seqid *      seqid;
         int                     open_flags;
         fmode_t                 fmode;
+        u32                     share_access;
         u32                     access;
         __u64                   clientid;
         struct stateowner_id    id;
@@ -389,9 +393,10 @@ struct nfs_open_confirmres {
 struct nfs_closeargs {
         struct nfs4_sequence_args       seq_args;
         struct nfs_fh *         fh;
-        nfs4_stateid *          stateid;
+        nfs4_stateid            stateid;
         struct nfs_seqid *      seqid;
         fmode_t                 fmode;
+        u32                     share_access;
         const u32 *             bitmask;
 };
 
@@ -416,12 +421,13 @@ struct nfs_lock_args {
         struct nfs_fh *         fh;
         struct file_lock *      fl;
         struct nfs_seqid *      lock_seqid;
-        nfs4_stateid *          lock_stateid;
+        nfs4_stateid            lock_stateid;
         struct nfs_seqid *      open_seqid;
-        nfs4_stateid *          open_stateid;
+        nfs4_stateid            open_stateid;
         struct nfs_lowner       lock_owner;
         unsigned char           block : 1;
         unsigned char           reclaim : 1;
+        unsigned char           new_lock : 1;
         unsigned char           new_lock_owner : 1;
 };
 
@@ -437,7 +443,7 @@ struct nfs_locku_args {
         struct nfs_fh *         fh;
         struct file_lock *      fl;
         struct nfs_seqid *      seqid;
-        nfs4_stateid *          stateid;
+        nfs4_stateid            stateid;
 };
 
 struct nfs_locku_res {
@@ -513,6 +519,7 @@ struct nfs_pgio_res {
         struct nfs4_sequence_res        seq_res;
         struct nfs_fattr *      fattr;
         __u32                   count;
+        __u32                   op_status;
         int                     eof;            /* used by read */
         struct nfs_writeverf *  verf;           /* used by write */
         const struct nfs_server *server;        /* used by write */
@@ -532,6 +539,7 @@ struct nfs_commitargs {
 
 struct nfs_commitres {
         struct nfs4_sequence_res        seq_res;
+        __u32                   op_status;
         struct nfs_fattr        *fattr;
         struct nfs_writeverf    *verf;
         const struct nfs_server *server;
@@ -1325,7 +1333,8 @@ struct nfs_pgio_header {
         __u64                   mds_offset;     /* Filelayout dense stripe */
         struct nfs_page_array   page_array;
         struct nfs_client       *ds_clp;        /* pNFS data server */
-        int                     ds_idx;         /* ds index if ds_clp is set */
+        int                     ds_commit_idx;  /* ds index if ds_clp is set */
+        int                     pgio_mirror_idx;/* mirror index in pgio layer */
 };
 
 struct nfs_mds_commit_info {