1 files changed, 10 insertions, 2 deletions

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 51914d7d6cc4..fc461926c412 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -196,8 +196,10 @@ struct nfs_openargs {
         __u64                   clientid;
         __u64                   id;
         union {
-                struct iattr *  attrs;    /* UNCHECKED, GUARDED */
-                nfs4_verifier   verifier; /* EXCLUSIVE */
+                struct {
+                        struct iattr *  attrs;    /* UNCHECKED, GUARDED */
+                        nfs4_verifier   verifier; /* EXCLUSIVE */
+                };
                 nfs4_stateid    delegation;             /* CLAIM_DELEGATE_CUR */
                 fmode_t         delegation_type;        /* CLAIM_PREVIOUS */
         } u;
@@ -313,6 +315,10 @@ struct nfs_lockt_res {
         struct nfs4_sequence_res        seq_res;
 };
 
+struct nfs_release_lockowner_args {
+        struct nfs_lowner       lock_owner;
+};
+
 struct nfs4_delegreturnargs {
         const struct nfs_fh *fhandle;
         const nfs4_stateid *stateid;
@@ -332,6 +338,7 @@ struct nfs4_delegreturnres {
 struct nfs_readargs {
         struct nfs_fh *         fh;
         struct nfs_open_context *context;
+        struct nfs_lock_context *lock_context;
         __u64                   offset;
         __u32                   count;
         unsigned int            pgbase;
@@ -352,6 +359,7 @@ struct nfs_readres {
 struct nfs_writeargs {
         struct nfs_fh *         fh;
         struct nfs_open_context *context;
+        struct nfs_lock_context *lock_context;
         __u64                   offset;
         __u32                   count;
         enum nfs3_stable_how    stable;