NFSv4.1: Simplify struct nfs4_sequence_args too

[mirror_ubuntu-artful-kernel.git] / include / linux / nfs_xdr.h

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index be9cf3c7e79ec0afcc0e024f6b95da5ab2bbd97e..deb31bbbb85769397ea283927e67c574d66a36ad 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -187,20 +187,20 @@ struct nfs4_channel_attrs {
 
 /* nfs41 sessions slot seqid */
 struct nfs4_slot {
+       struct nfs4_slot_table  *table;
+       unsigned long           renewal_time;
+       u32                     slot_nr;
        u32                     seq_nr;
 };
 
 struct nfs4_sequence_args {
-       struct nfs4_session     *sa_session;
-       u32                     sa_slotid;
+       struct nfs4_slot        *sa_slot;
        u8                      sa_cache_this;
 };
 
 struct nfs4_sequence_res {
-       struct nfs4_session     *sr_session;
        struct nfs4_slot        *sr_slot;       /* slot used to send request */
        int                     sr_status;      /* sequence operation status */
-       unsigned long           sr_renewal_time;
        u32                     sr_status_flags;
 };
 
@@ -251,7 +251,6 @@ struct nfs4_layoutget_res {
 struct nfs4_layoutget {
        struct nfs4_layoutget_args args;
        struct nfs4_layoutget_res res;
-       struct pnfs_layout_segment **lsegpp;
        gfp_t gfp_flags;
 };
 
@@ -335,6 +334,7 @@ struct nfs_openargs {
        struct nfs_seqid *      seqid;
        int                     open_flags;
        fmode_t                 fmode;
+       u32                     access;
        __u64                   clientid;
        struct stateowner_id    id;
        union {
@@ -369,6 +369,9 @@ struct nfs_openres {
        struct nfs4_string      *owner;
        struct nfs4_string      *group_owner;
        struct nfs4_sequence_res        seq_res;
+       __u32                   access_request;
+       __u32                   access_supported;
+       __u32                   access_result;
 };
 
 /*