nfs: nfs4xdr: get rid of WRITE64
[safe/jmp/linux-2.6] / fs / nfs / nfs4xdr.c
index 3e77789..5d80766 100644 (file)
@@ -192,12 +192,16 @@ static int nfs4_stat_to_errno(int);
                                 decode_verifier_maxsz)
 #define encode_remove_maxsz    (op_encode_hdr_maxsz + \
                                nfs4_name_maxsz)
+#define decode_remove_maxsz    (op_decode_hdr_maxsz + \
+                                decode_change_info_maxsz)
 #define encode_rename_maxsz    (op_encode_hdr_maxsz + \
                                2 * nfs4_name_maxsz)
-#define decode_rename_maxsz    (op_decode_hdr_maxsz + 5 + 5)
+#define decode_rename_maxsz    (op_decode_hdr_maxsz + \
+                                decode_change_info_maxsz + \
+                                decode_change_info_maxsz)
 #define encode_link_maxsz      (op_encode_hdr_maxsz + \
                                nfs4_name_maxsz)
-#define decode_link_maxsz      (op_decode_hdr_maxsz + 5)
+#define decode_link_maxsz      (op_decode_hdr_maxsz + decode_change_info_maxsz)
 #define encode_lock_maxsz      (op_encode_hdr_maxsz + \
                                 7 + \
                                 1 + encode_stateid_maxsz + 8)
@@ -240,43 +244,115 @@ static int nfs4_stat_to_errno(int);
                                (encode_getattr_maxsz)
 #define decode_fs_locations_maxsz \
                                (0)
+
+#if defined(CONFIG_NFS_V4_1)
+#define NFS4_MAX_MACHINE_NAME_LEN (64)
+
+#define encode_exchange_id_maxsz (op_encode_hdr_maxsz + \
+                               encode_verifier_maxsz + \
+                               1 /* co_ownerid.len */ + \
+                               XDR_QUADLEN(NFS4_EXCHANGE_ID_LEN) + \
+                               1 /* flags */ + \
+                               1 /* spa_how */ + \
+                               0 /* SP4_NONE (for now) */ + \
+                               1 /* zero implemetation id array */)
+#define decode_exchange_id_maxsz (op_decode_hdr_maxsz + \
+                               2 /* eir_clientid */ + \
+                               1 /* eir_sequenceid */ + \
+                               1 /* eir_flags */ + \
+                               1 /* spr_how */ + \
+                               0 /* SP4_NONE (for now) */ + \
+                               2 /* eir_server_owner.so_minor_id */ + \
+                               /* eir_server_owner.so_major_id<> */ \
+                               XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + 1 + \
+                               /* eir_server_scope<> */ \
+                               XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + 1 + \
+                               1 /* eir_server_impl_id array length */ + \
+                               0 /* ignored eir_server_impl_id contents */)
+#define encode_channel_attrs_maxsz  (6 + 1 /* ca_rdma_ird.len (0) */)
+#define decode_channel_attrs_maxsz  (6 + \
+                                    1 /* ca_rdma_ird.len */ + \
+                                    1 /* ca_rdma_ird */)
+#define encode_create_session_maxsz  (op_encode_hdr_maxsz + \
+                                    2 /* csa_clientid */ + \
+                                    1 /* csa_sequence */ + \
+                                    1 /* csa_flags */ + \
+                                    encode_channel_attrs_maxsz + \
+                                    encode_channel_attrs_maxsz + \
+                                    1 /* csa_cb_program */ + \
+                                    1 /* csa_sec_parms.len (1) */ + \
+                                    1 /* cb_secflavor (AUTH_SYS) */ + \
+                                    1 /* stamp */ + \
+                                    1 /* machinename.len */ + \
+                                    XDR_QUADLEN(NFS4_MAX_MACHINE_NAME_LEN) + \
+                                    1 /* uid */ + \
+                                    1 /* gid */ + \
+                                    1 /* gids.len (0) */)
+#define decode_create_session_maxsz  (op_decode_hdr_maxsz +    \
+                                    XDR_QUADLEN(NFS4_MAX_SESSIONID_LEN) + \
+                                    1 /* csr_sequence */ + \
+                                    1 /* csr_flags */ + \
+                                    decode_channel_attrs_maxsz + \
+                                    decode_channel_attrs_maxsz)
+#define encode_destroy_session_maxsz    (op_encode_hdr_maxsz + 4)
+#define decode_destroy_session_maxsz    (op_decode_hdr_maxsz)
+#define encode_sequence_maxsz  (op_encode_hdr_maxsz + \
+                               XDR_QUADLEN(NFS4_MAX_SESSIONID_LEN) + 4)
+#define decode_sequence_maxsz  (op_decode_hdr_maxsz + \
+                               XDR_QUADLEN(NFS4_MAX_SESSIONID_LEN) + 5)
+#else /* CONFIG_NFS_V4_1 */
+#define encode_sequence_maxsz  0
+#define decode_sequence_maxsz  0
+#endif /* CONFIG_NFS_V4_1 */
+
 #define NFS4_enc_compound_sz   (1024)  /* XXX: large enough? */
 #define NFS4_dec_compound_sz   (1024)  /* XXX: large enough? */
 #define NFS4_enc_read_sz       (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_read_maxsz)
 #define NFS4_dec_read_sz       (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_read_maxsz)
 #define NFS4_enc_readlink_sz   (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_readlink_maxsz)
 #define NFS4_dec_readlink_sz   (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_readlink_maxsz)
 #define NFS4_enc_readdir_sz    (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_readdir_maxsz)
 #define NFS4_dec_readdir_sz    (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_readdir_maxsz)
 #define NFS4_enc_write_sz      (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_write_maxsz + \
                                encode_getattr_maxsz)
 #define NFS4_dec_write_sz      (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_write_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_enc_commit_sz     (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_commit_maxsz + \
                                encode_getattr_maxsz)
 #define NFS4_dec_commit_sz     (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_commit_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_enc_open_sz        (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_savefh_maxsz + \
                                encode_open_maxsz + \
@@ -285,6 +361,7 @@ static int nfs4_stat_to_errno(int);
                                encode_restorefh_maxsz + \
                                encode_getattr_maxsz)
 #define NFS4_dec_open_sz        (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_savefh_maxsz + \
                                decode_open_maxsz + \
@@ -301,43 +378,53 @@ static int nfs4_stat_to_errno(int);
                                 decode_putfh_maxsz + \
                                 decode_open_confirm_maxsz)
 #define NFS4_enc_open_noattr_sz        (compound_encode_hdr_maxsz + \
+                                       encode_sequence_maxsz + \
                                        encode_putfh_maxsz + \
                                        encode_open_maxsz + \
                                        encode_getattr_maxsz)
 #define NFS4_dec_open_noattr_sz        (compound_decode_hdr_maxsz + \
+                                       decode_sequence_maxsz + \
                                        decode_putfh_maxsz + \
                                        decode_open_maxsz + \
                                        decode_getattr_maxsz)
 #define NFS4_enc_open_downgrade_sz \
                                (compound_encode_hdr_maxsz + \
+                                encode_sequence_maxsz + \
                                 encode_putfh_maxsz + \
                                 encode_open_downgrade_maxsz + \
                                 encode_getattr_maxsz)
 #define NFS4_dec_open_downgrade_sz \
                                (compound_decode_hdr_maxsz + \
+                                decode_sequence_maxsz + \
                                 decode_putfh_maxsz + \
                                 decode_open_downgrade_maxsz + \
                                 decode_getattr_maxsz)
 #define NFS4_enc_close_sz      (compound_encode_hdr_maxsz + \
+                                encode_sequence_maxsz + \
                                 encode_putfh_maxsz + \
                                 encode_close_maxsz + \
                                 encode_getattr_maxsz)
 #define NFS4_dec_close_sz      (compound_decode_hdr_maxsz + \
+                                decode_sequence_maxsz + \
                                 decode_putfh_maxsz + \
                                 decode_close_maxsz + \
                                 decode_getattr_maxsz)
 #define NFS4_enc_setattr_sz    (compound_encode_hdr_maxsz + \
+                                encode_sequence_maxsz + \
                                 encode_putfh_maxsz + \
                                 encode_setattr_maxsz + \
                                 encode_getattr_maxsz)
 #define NFS4_dec_setattr_sz    (compound_decode_hdr_maxsz + \
+                                decode_sequence_maxsz + \
                                 decode_putfh_maxsz + \
                                 decode_setattr_maxsz + \
                                 decode_getattr_maxsz)
 #define NFS4_enc_fsinfo_sz     (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_fsinfo_maxsz)
 #define NFS4_dec_fsinfo_sz     (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_fsinfo_maxsz)
 #define NFS4_enc_renew_sz      (compound_encode_hdr_maxsz + \
@@ -359,64 +446,81 @@ static int nfs4_stat_to_errno(int);
                                decode_putrootfh_maxsz + \
                                decode_fsinfo_maxsz)
 #define NFS4_enc_lock_sz        (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_lock_maxsz)
 #define NFS4_dec_lock_sz        (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_lock_maxsz)
 #define NFS4_enc_lockt_sz       (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_lockt_maxsz)
 #define NFS4_dec_lockt_sz       (compound_decode_hdr_maxsz + \
+                                decode_sequence_maxsz + \
                                 decode_putfh_maxsz + \
                                 decode_lockt_maxsz)
 #define NFS4_enc_locku_sz       (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_locku_maxsz)
 #define NFS4_dec_locku_sz       (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_locku_maxsz)
 #define NFS4_enc_access_sz     (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_access_maxsz + \
                                encode_getattr_maxsz)
 #define NFS4_dec_access_sz     (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_access_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_enc_getattr_sz    (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_getattr_maxsz)
 #define NFS4_dec_getattr_sz    (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_enc_lookup_sz     (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_lookup_maxsz + \
                                encode_getattr_maxsz + \
                                encode_getfh_maxsz)
 #define NFS4_dec_lookup_sz     (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_lookup_maxsz + \
                                decode_getattr_maxsz + \
                                decode_getfh_maxsz)
 #define NFS4_enc_lookup_root_sz (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putrootfh_maxsz + \
                                encode_getattr_maxsz + \
                                encode_getfh_maxsz)
 #define NFS4_dec_lookup_root_sz (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putrootfh_maxsz + \
                                decode_getattr_maxsz + \
                                decode_getfh_maxsz)
 #define NFS4_enc_remove_sz     (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_remove_maxsz + \
                                encode_getattr_maxsz)
 #define NFS4_dec_remove_sz     (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
-                               op_decode_hdr_maxsz + 5 + \
+                               decode_remove_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_enc_rename_sz     (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_savefh_maxsz + \
                                encode_putfh_maxsz + \
@@ -425,6 +529,7 @@ static int nfs4_stat_to_errno(int);
                                encode_restorefh_maxsz + \
                                encode_getattr_maxsz)
 #define NFS4_dec_rename_sz     (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_savefh_maxsz + \
                                decode_putfh_maxsz + \
@@ -433,6 +538,7 @@ static int nfs4_stat_to_errno(int);
                                decode_restorefh_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_enc_link_sz       (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_savefh_maxsz + \
                                encode_putfh_maxsz + \
@@ -441,6 +547,7 @@ static int nfs4_stat_to_errno(int);
                                encode_restorefh_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_dec_link_sz       (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_savefh_maxsz + \
                                decode_putfh_maxsz + \
@@ -449,16 +556,19 @@ static int nfs4_stat_to_errno(int);
                                decode_restorefh_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_enc_symlink_sz    (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_symlink_maxsz + \
                                encode_getattr_maxsz + \
                                encode_getfh_maxsz)
 #define NFS4_dec_symlink_sz    (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_symlink_maxsz + \
                                decode_getattr_maxsz + \
                                decode_getfh_maxsz)
 #define NFS4_enc_create_sz     (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_savefh_maxsz + \
                                encode_create_maxsz + \
@@ -467,6 +577,7 @@ static int nfs4_stat_to_errno(int);
                                encode_restorefh_maxsz + \
                                encode_getattr_maxsz)
 #define NFS4_dec_create_sz     (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_savefh_maxsz + \
                                decode_create_maxsz + \
@@ -475,52 +586,98 @@ static int nfs4_stat_to_errno(int);
                                decode_restorefh_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_enc_pathconf_sz   (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_getattr_maxsz)
 #define NFS4_dec_pathconf_sz   (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_enc_statfs_sz     (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_statfs_maxsz)
 #define NFS4_dec_statfs_sz     (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_statfs_maxsz)
 #define NFS4_enc_server_caps_sz (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_getattr_maxsz)
 #define NFS4_dec_server_caps_sz (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_enc_delegreturn_sz        (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_delegreturn_maxsz + \
                                encode_getattr_maxsz)
 #define NFS4_dec_delegreturn_sz (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_delegreturn_maxsz + \
                                decode_getattr_maxsz)
 #define NFS4_enc_getacl_sz     (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_getacl_maxsz)
 #define NFS4_dec_getacl_sz     (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_getacl_maxsz)
 #define NFS4_enc_setacl_sz     (compound_encode_hdr_maxsz + \
+                               encode_sequence_maxsz + \
                                encode_putfh_maxsz + \
                                encode_setacl_maxsz)
 #define NFS4_dec_setacl_sz     (compound_decode_hdr_maxsz + \
+                               decode_sequence_maxsz + \
                                decode_putfh_maxsz + \
                                decode_setacl_maxsz)
 #define NFS4_enc_fs_locations_sz \
                                (compound_encode_hdr_maxsz + \
+                                encode_sequence_maxsz + \
                                 encode_putfh_maxsz + \
                                 encode_lookup_maxsz + \
                                 encode_fs_locations_maxsz)
 #define NFS4_dec_fs_locations_sz \
                                (compound_decode_hdr_maxsz + \
+                                decode_sequence_maxsz + \
                                 decode_putfh_maxsz + \
                                 decode_lookup_maxsz + \
                                 decode_fs_locations_maxsz)
+#if defined(CONFIG_NFS_V4_1)
+#define NFS4_enc_exchange_id_sz \
+                               (compound_encode_hdr_maxsz + \
+                                encode_exchange_id_maxsz)
+#define NFS4_dec_exchange_id_sz \
+                               (compound_decode_hdr_maxsz + \
+                                decode_exchange_id_maxsz)
+#define NFS4_enc_create_session_sz \
+                               (compound_encode_hdr_maxsz + \
+                                encode_create_session_maxsz)
+#define NFS4_dec_create_session_sz \
+                               (compound_decode_hdr_maxsz + \
+                                decode_create_session_maxsz)
+#define NFS4_enc_destroy_session_sz    (compound_encode_hdr_maxsz + \
+                                        encode_destroy_session_maxsz)
+#define NFS4_dec_destroy_session_sz    (compound_decode_hdr_maxsz + \
+                                        decode_destroy_session_maxsz)
+#define NFS4_enc_sequence_sz \
+                               (compound_decode_hdr_maxsz + \
+                                encode_sequence_maxsz)
+#define NFS4_dec_sequence_sz \
+                               (compound_decode_hdr_maxsz + \
+                                decode_sequence_maxsz)
+#define NFS4_enc_get_lease_time_sz     (compound_encode_hdr_maxsz + \
+                                        encode_sequence_maxsz + \
+                                        encode_putrootfh_maxsz + \
+                                        encode_fsinfo_maxsz)
+#define NFS4_dec_get_lease_time_sz     (compound_decode_hdr_maxsz + \
+                                        decode_sequence_maxsz + \
+                                        decode_putrootfh_maxsz + \
+                                        decode_fsinfo_maxsz)
+#endif /* CONFIG_NFS_V4_1 */
 
 static const umode_t nfs_type2fmt[] = {
        [NF4BAD] = 0,
@@ -541,6 +698,8 @@ struct compound_hdr {
        __be32 *        nops_p;
        uint32_t        taglen;
        char *          tag;
+       uint32_t        replen;         /* expected reply words */
+       u32             minorversion;
 };
 
 /*
@@ -553,11 +712,6 @@ struct compound_hdr {
  * task to translate them into Linux-specific versions which are more
  * consistent with the style used in NFSv2/v3...
  */
-#define WRITE32(n)               *p++ = htonl(n)
-#define WRITE64(n)               do {                          \
-       *p++ = htonl((uint32_t)((n) >> 32));                            \
-       *p++ = htonl((uint32_t)(n));                                    \
-} while (0)
 #define WRITEMEM(ptr,nbytes)     do {                          \
        p = xdr_encode_opaque_fixed(p, ptr, nbytes);            \
 } while (0)
@@ -576,22 +730,31 @@ static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *
        xdr_encode_opaque(p, str, len);
 }
 
-static void encode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr)
+static void encode_compound_hdr(struct xdr_stream *xdr,
+                               struct rpc_rqst *req,
+                               struct compound_hdr *hdr)
 {
        __be32 *p;
+       struct rpc_auth *auth = req->rq_task->tk_msg.rpc_cred->cr_auth;
+
+       /* initialize running count of expected bytes in reply.
+        * NOTE: the replied tag SHOULD be the same is the one sent,
+        * but this is not required as a MUST for the server to do so. */
+       hdr->replen = RPC_REPHDRSIZE + auth->au_rslack + 3 + hdr->taglen;
 
        dprintk("encode_compound: tag=%.*s\n", (int)hdr->taglen, hdr->tag);
        BUG_ON(hdr->taglen > NFS4_MAXTAGLEN);
        RESERVE_SPACE(12+(XDR_QUADLEN(hdr->taglen)<<2));
-       WRITE32(hdr->taglen);
+       *p++ = cpu_to_be32(hdr->taglen);
        WRITEMEM(hdr->tag, hdr->taglen);
-       WRITE32(NFS4_MINOR_VERSION);
+       *p++ = cpu_to_be32(hdr->minorversion);
        hdr->nops_p = p;
-       WRITE32(hdr->nops);
+       *p++ = cpu_to_be32(hdr->nops);
 }
 
 static void encode_nops(struct compound_hdr *hdr)
 {
+       BUG_ON(hdr->nops > NFS4_MAX_OPS);
        *hdr->nops_p = htonl(hdr->nops);
 }
 
@@ -667,49 +830,49 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const
         * We write the bitmap length now, but leave the bitmap and the attribute
         * buffer length to be backfilled at the end of this routine.
         */
-       WRITE32(2);
+       *p++ = cpu_to_be32(2);
        q = p;
        p += 3;
 
        if (iap->ia_valid & ATTR_SIZE) {
                bmval0 |= FATTR4_WORD0_SIZE;
-               WRITE64(iap->ia_size);
+               p = xdr_encode_hyper(p, iap->ia_size);
        }
        if (iap->ia_valid & ATTR_MODE) {
                bmval1 |= FATTR4_WORD1_MODE;
-               WRITE32(iap->ia_mode & S_IALLUGO);
+               *p++ = cpu_to_be32(iap->ia_mode & S_IALLUGO);
        }
        if (iap->ia_valid & ATTR_UID) {
                bmval1 |= FATTR4_WORD1_OWNER;
-               WRITE32(owner_namelen);
+               *p++ = cpu_to_be32(owner_namelen);
                WRITEMEM(owner_name, owner_namelen);
        }
        if (iap->ia_valid & ATTR_GID) {
                bmval1 |= FATTR4_WORD1_OWNER_GROUP;
-               WRITE32(owner_grouplen);
+               *p++ = cpu_to_be32(owner_grouplen);
                WRITEMEM(owner_group, owner_grouplen);
        }
        if (iap->ia_valid & ATTR_ATIME_SET) {
                bmval1 |= FATTR4_WORD1_TIME_ACCESS_SET;
-               WRITE32(NFS4_SET_TO_CLIENT_TIME);
-               WRITE32(0);
-               WRITE32(iap->ia_mtime.tv_sec);
-               WRITE32(iap->ia_mtime.tv_nsec);
+               *p++ = cpu_to_be32(NFS4_SET_TO_CLIENT_TIME);
+               *p++ = cpu_to_be32(0);
+               *p++ = cpu_to_be32(iap->ia_mtime.tv_sec);
+               *p++ = cpu_to_be32(iap->ia_mtime.tv_nsec);
        }
        else if (iap->ia_valid & ATTR_ATIME) {
                bmval1 |= FATTR4_WORD1_TIME_ACCESS_SET;
-               WRITE32(NFS4_SET_TO_SERVER_TIME);
+               *p++ = cpu_to_be32(NFS4_SET_TO_SERVER_TIME);
        }
        if (iap->ia_valid & ATTR_MTIME_SET) {
                bmval1 |= FATTR4_WORD1_TIME_MODIFY_SET;
-               WRITE32(NFS4_SET_TO_CLIENT_TIME);
-               WRITE32(0);
-               WRITE32(iap->ia_mtime.tv_sec);
-               WRITE32(iap->ia_mtime.tv_nsec);
+               *p++ = cpu_to_be32(NFS4_SET_TO_CLIENT_TIME);
+               *p++ = cpu_to_be32(0);
+               *p++ = cpu_to_be32(iap->ia_mtime.tv_sec);
+               *p++ = cpu_to_be32(iap->ia_mtime.tv_nsec);
        }
        else if (iap->ia_valid & ATTR_MTIME) {
                bmval1 |= FATTR4_WORD1_TIME_MODIFY_SET;
-               WRITE32(NFS4_SET_TO_SERVER_TIME);
+               *p++ = cpu_to_be32(NFS4_SET_TO_SERVER_TIME);
        }
 
        /*
@@ -733,9 +896,10 @@ static void encode_access(struct xdr_stream *xdr, u32 access, struct compound_hd
        __be32 *p;
 
        RESERVE_SPACE(8);
-       WRITE32(OP_ACCESS);
-       WRITE32(access);
+       *p++ = cpu_to_be32(OP_ACCESS);
+       *p++ = cpu_to_be32(access);
        hdr->nops++;
+       hdr->replen += decode_access_maxsz;
 }
 
 static void encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg, struct compound_hdr *hdr)
@@ -743,10 +907,11 @@ static void encode_close(struct xdr_stream *xdr, const struct nfs_closeargs *arg
        __be32 *p;
 
        RESERVE_SPACE(8+NFS4_STATEID_SIZE);
-       WRITE32(OP_CLOSE);
-       WRITE32(arg->seqid->sequence->counter);
+       *p++ = cpu_to_be32(OP_CLOSE);
+       *p++ = cpu_to_be32(arg->seqid->sequence->counter);
        WRITEMEM(arg->stateid->data, NFS4_STATEID_SIZE);
        hdr->nops++;
+       hdr->replen += decode_close_maxsz;
 }
 
 static void encode_commit(struct xdr_stream *xdr, const struct nfs_writeargs *args, struct compound_hdr *hdr)
@@ -754,10 +919,11 @@ static void encode_commit(struct xdr_stream *xdr, const struct nfs_writeargs *ar
        __be32 *p;
 
        RESERVE_SPACE(16);
-       WRITE32(OP_COMMIT);
-       WRITE64(args->offset);
-       WRITE32(args->count);
+       *p++ = cpu_to_be32(OP_COMMIT);
+       p = xdr_encode_hyper(p, args->offset);
+       *p++ = cpu_to_be32(args->count);
        hdr->nops++;
+       hdr->replen += decode_commit_maxsz;
 }
 
 static void encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg *create, struct compound_hdr *hdr)
@@ -765,20 +931,20 @@ static void encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg *
        __be32 *p;
 
        RESERVE_SPACE(8);
-       WRITE32(OP_CREATE);
-       WRITE32(create->ftype);
+       *p++ = cpu_to_be32(OP_CREATE);
+       *p++ = cpu_to_be32(create->ftype);
 
        switch (create->ftype) {
        case NF4LNK:
                RESERVE_SPACE(4);
-               WRITE32(create->u.symlink.len);
+               *p++ = cpu_to_be32(create->u.symlink.len);
                xdr_write_pages(xdr, create->u.symlink.pages, 0, create->u.symlink.len);
                break;
 
        case NF4BLK: case NF4CHR:
                RESERVE_SPACE(8);
-               WRITE32(create->u.device.specdata1);
-               WRITE32(create->u.device.specdata2);
+               *p++ = cpu_to_be32(create->u.device.specdata1);
+               *p++ = cpu_to_be32(create->u.device.specdata2);
                break;
 
        default:
@@ -786,9 +952,10 @@ static void encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg *
        }
 
        RESERVE_SPACE(4 + create->name->len);
-       WRITE32(create->name->len);
+       *p++ = cpu_to_be32(create->name->len);
        WRITEMEM(create->name->name, create->name->len);
        hdr->nops++;
+       hdr->replen += decode_create_maxsz;
 
        encode_attrs(xdr, create->attrs, create->server);
 }
@@ -798,10 +965,11 @@ static void encode_getattr_one(struct xdr_stream *xdr, uint32_t bitmap, struct c
        __be32 *p;
 
        RESERVE_SPACE(12);
-       WRITE32(OP_GETATTR);
-       WRITE32(1);
-       WRITE32(bitmap);
+       *p++ = cpu_to_be32(OP_GETATTR);
+       *p++ = cpu_to_be32(1);
+       *p++ = cpu_to_be32(bitmap);
        hdr->nops++;
+       hdr->replen += decode_getattr_maxsz;
 }
 
 static void encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm1, struct compound_hdr *hdr)
@@ -809,11 +977,12 @@ static void encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm
        __be32 *p;
 
        RESERVE_SPACE(16);
-       WRITE32(OP_GETATTR);
-       WRITE32(2);
-       WRITE32(bm0);
-       WRITE32(bm1);
+       *p++ = cpu_to_be32(OP_GETATTR);
+       *p++ = cpu_to_be32(2);
+       *p++ = cpu_to_be32(bm0);
+       *p++ = cpu_to_be32(bm1);
        hdr->nops++;
+       hdr->replen += decode_getattr_maxsz;
 }
 
 static void encode_getfattr(struct xdr_stream *xdr, const u32* bitmask, struct compound_hdr *hdr)
@@ -839,8 +1008,9 @@ static void encode_getfh(struct xdr_stream *xdr, struct compound_hdr *hdr)
        __be32 *p;
 
        RESERVE_SPACE(4);
-       WRITE32(OP_GETFH);
+       *p++ = cpu_to_be32(OP_GETFH);
        hdr->nops++;
+       hdr->replen += decode_getfh_maxsz;
 }
 
 static void encode_link(struct xdr_stream *xdr, const struct qstr *name, struct compound_hdr *hdr)
@@ -848,10 +1018,11 @@ static void encode_link(struct xdr_stream *xdr, const struct qstr *name, struct
        __be32 *p;
 
        RESERVE_SPACE(8 + name->len);
-       WRITE32(OP_LINK);
-       WRITE32(name->len);
+       *p++ = cpu_to_be32(OP_LINK);
+       *p++ = cpu_to_be32(name->len);
        WRITEMEM(name->name, name->len);
        hdr->nops++;
+       hdr->replen += decode_link_maxsz;
 }
 
 static inline int nfs4_lock_type(struct file_lock *fl, int block)
@@ -877,28 +1048,29 @@ static void encode_lock(struct xdr_stream *xdr, const struct nfs_lock_args *args
        __be32 *p;
 
        RESERVE_SPACE(32);
-       WRITE32(OP_LOCK);
-       WRITE32(nfs4_lock_type(args->fl, args->block));
-       WRITE32(args->reclaim);
-       WRITE64(args->fl->fl_start);
-       WRITE64(nfs4_lock_length(args->fl));
-       WRITE32(args->new_lock_owner);
+       *p++ = cpu_to_be32(OP_LOCK);
+       *p++ = cpu_to_be32(nfs4_lock_type(args->fl, args->block));
+       *p++ = cpu_to_be32(args->reclaim);
+       p = xdr_encode_hyper(p, args->fl->fl_start);
+       p = xdr_encode_hyper(p, nfs4_lock_length(args->fl));
+       *p++ = cpu_to_be32(args->new_lock_owner);
        if (args->new_lock_owner){
                RESERVE_SPACE(4+NFS4_STATEID_SIZE+32);
-               WRITE32(args->open_seqid->sequence->counter);
+               *p++ = cpu_to_be32(args->open_seqid->sequence->counter);
                WRITEMEM(args->open_stateid->data, NFS4_STATEID_SIZE);
-               WRITE32(args->lock_seqid->sequence->counter);
-               WRITE64(args->lock_owner.clientid);
-               WRITE32(16);
+               *p++ = cpu_to_be32(args->lock_seqid->sequence->counter);
+               p = xdr_encode_hyper(p, args->lock_owner.clientid);
+               *p++ = cpu_to_be32(16);
                WRITEMEM("lock id:", 8);
-               WRITE64(args->lock_owner.id);
+               p = xdr_encode_hyper(p, args->lock_owner.id);
        }
        else {
                RESERVE_SPACE(NFS4_STATEID_SIZE+4);
                WRITEMEM(args->lock_stateid->data, NFS4_STATEID_SIZE);
-               WRITE32(args->lock_seqid->sequence->counter);
+               *p++ = cpu_to_be32(args->lock_seqid->sequence->counter);
        }
        hdr->nops++;
+       hdr->replen += decode_lock_maxsz;
 }
 
 static void encode_lockt(struct xdr_stream *xdr, const struct nfs_lockt_args *args, struct compound_hdr *hdr)
@@ -906,15 +1078,16 @@ static void encode_lockt(struct xdr_stream *xdr, const struct nfs_lockt_args *ar
        __be32 *p;
 
        RESERVE_SPACE(52);
-       WRITE32(OP_LOCKT);
-       WRITE32(nfs4_lock_type(args->fl, 0));
-       WRITE64(args->fl->fl_start);
-       WRITE64(nfs4_lock_length(args->fl));
-       WRITE64(args->lock_owner.clientid);
-       WRITE32(16);
+       *p++ = cpu_to_be32(OP_LOCKT);
+       *p++ = cpu_to_be32(nfs4_lock_type(args->fl, 0));
+       p = xdr_encode_hyper(p, args->fl->fl_start);
+       p = xdr_encode_hyper(p, nfs4_lock_length(args->fl));
+       p = xdr_encode_hyper(p, args->lock_owner.clientid);
+       *p++ = cpu_to_be32(16);
        WRITEMEM("lock id:", 8);
-       WRITE64(args->lock_owner.id);
+       p = xdr_encode_hyper(p, args->lock_owner.id);
        hdr->nops++;
+       hdr->replen += decode_lockt_maxsz;
 }
 
 static void encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *args, struct compound_hdr *hdr)
@@ -922,13 +1095,14 @@ static void encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *ar
        __be32 *p;
 
        RESERVE_SPACE(12+NFS4_STATEID_SIZE+16);
-       WRITE32(OP_LOCKU);
-       WRITE32(nfs4_lock_type(args->fl, 0));
-       WRITE32(args->seqid->sequence->counter);
+       *p++ = cpu_to_be32(OP_LOCKU);
+       *p++ = cpu_to_be32(nfs4_lock_type(args->fl, 0));
+       *p++ = cpu_to_be32(args->seqid->sequence->counter);
        WRITEMEM(args->stateid->data, NFS4_STATEID_SIZE);
-       WRITE64(args->fl->fl_start);
-       WRITE64(nfs4_lock_length(args->fl));
+       p = xdr_encode_hyper(p, args->fl->fl_start);
+       p = xdr_encode_hyper(p, nfs4_lock_length(args->fl));
        hdr->nops++;
+       hdr->replen += decode_locku_maxsz;
 }
 
 static void encode_lookup(struct xdr_stream *xdr, const struct qstr *name, struct compound_hdr *hdr)
@@ -937,10 +1111,11 @@ static void encode_lookup(struct xdr_stream *xdr, const struct qstr *name, struc
        __be32 *p;
 
        RESERVE_SPACE(8 + len);
-       WRITE32(OP_LOOKUP);
-       WRITE32(len);
+       *p++ = cpu_to_be32(OP_LOOKUP);
+       *p++ = cpu_to_be32(len);
        WRITEMEM(name->name, len);
        hdr->nops++;
+       hdr->replen += decode_lookup_maxsz;
 }
 
 static void encode_share_access(struct xdr_stream *xdr, fmode_t fmode)
@@ -950,18 +1125,18 @@ static void encode_share_access(struct xdr_stream *xdr, fmode_t fmode)
        RESERVE_SPACE(8);
        switch (fmode & (FMODE_READ|FMODE_WRITE)) {
        case FMODE_READ:
-               WRITE32(NFS4_SHARE_ACCESS_READ);
+               *p++ = cpu_to_be32(NFS4_SHARE_ACCESS_READ);
                break;
        case FMODE_WRITE:
-               WRITE32(NFS4_SHARE_ACCESS_WRITE);
+               *p++ = cpu_to_be32(NFS4_SHARE_ACCESS_WRITE);
                break;
        case FMODE_READ|FMODE_WRITE:
-               WRITE32(NFS4_SHARE_ACCESS_BOTH);
+               *p++ = cpu_to_be32(NFS4_SHARE_ACCESS_BOTH);
                break;
        default:
-               WRITE32(0);
+               *p++ = cpu_to_be32(0);
        }
-       WRITE32(0);             /* for linux, share_deny = 0 always */
+       *p++ = cpu_to_be32(0);          /* for linux, share_deny = 0 always */
 }
 
 static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_openargs *arg)
@@ -972,14 +1147,14 @@ static inline void encode_openhdr(struct xdr_stream *xdr, const struct nfs_opena
  * owner 4 = 32
  */
        RESERVE_SPACE(8);
-       WRITE32(OP_OPEN);
-       WRITE32(arg->seqid->sequence->counter);
+       *p++ = cpu_to_be32(OP_OPEN);
+       *p++ = cpu_to_be32(arg->seqid->sequence->counter);
        encode_share_access(xdr, arg->fmode);
        RESERVE_SPACE(28);
-       WRITE64(arg->clientid);
-       WRITE32(16);
+       p = xdr_encode_hyper(p, arg->clientid);
+       *p++ = cpu_to_be32(16);
        WRITEMEM("open id:", 8);
-       WRITE64(arg->id);
+       p = xdr_encode_hyper(p, arg->id);
 }
 
 static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_openargs *arg)
@@ -989,11 +1164,11 @@ static inline void encode_createmode(struct xdr_stream *xdr, const struct nfs_op
        RESERVE_SPACE(4);
        switch(arg->open_flags & O_EXCL) {
        case 0:
-               WRITE32(NFS4_CREATE_UNCHECKED);
+               *p++ = cpu_to_be32(NFS4_CREATE_UNCHECKED);
                encode_attrs(xdr, arg->u.attrs, arg->server);
                break;
        default:
-               WRITE32(NFS4_CREATE_EXCLUSIVE);
+               *p++ = cpu_to_be32(NFS4_CREATE_EXCLUSIVE);
                encode_nfs4_verifier(xdr, &arg->u.verifier);
        }
 }
@@ -1005,11 +1180,11 @@ static void encode_opentype(struct xdr_stream *xdr, const struct nfs_openargs *a
        RESERVE_SPACE(4);
        switch (arg->open_flags & O_CREAT) {
        case 0:
-               WRITE32(NFS4_OPEN_NOCREATE);
+               *p++ = cpu_to_be32(NFS4_OPEN_NOCREATE);
                break;
        default:
                BUG_ON(arg->claim != NFS4_OPEN_CLAIM_NULL);
-               WRITE32(NFS4_OPEN_CREATE);
+               *p++ = cpu_to_be32(NFS4_OPEN_CREATE);
                encode_createmode(xdr, arg);
        }
 }
@@ -1021,13 +1196,13 @@ static inline void encode_delegation_type(struct xdr_stream *xdr, fmode_t delega
        RESERVE_SPACE(4);
        switch (delegation_type) {
        case 0:
-               WRITE32(NFS4_OPEN_DELEGATE_NONE);
+               *p++ = cpu_to_be32(NFS4_OPEN_DELEGATE_NONE);
                break;
        case FMODE_READ:
-               WRITE32(NFS4_OPEN_DELEGATE_READ);
+               *p++ = cpu_to_be32(NFS4_OPEN_DELEGATE_READ);
                break;
        case FMODE_WRITE|FMODE_READ:
-               WRITE32(NFS4_OPEN_DELEGATE_WRITE);
+               *p++ = cpu_to_be32(NFS4_OPEN_DELEGATE_WRITE);
                break;
        default:
                BUG();
@@ -1039,7 +1214,7 @@ static inline void encode_claim_null(struct xdr_stream *xdr, const struct qstr *
        __be32 *p;
 
        RESERVE_SPACE(4);
-       WRITE32(NFS4_OPEN_CLAIM_NULL);
+       *p++ = cpu_to_be32(NFS4_OPEN_CLAIM_NULL);
        encode_string(xdr, name->len, name->name);
 }
 
@@ -1048,7 +1223,7 @@ static inline void encode_claim_previous(struct xdr_stream *xdr, fmode_t type)
        __be32 *p;
 
        RESERVE_SPACE(4);
-       WRITE32(NFS4_OPEN_CLAIM_PREVIOUS);
+       *p++ = cpu_to_be32(NFS4_OPEN_CLAIM_PREVIOUS);
        encode_delegation_type(xdr, type);
 }
 
@@ -1057,7 +1232,7 @@ static inline void encode_claim_delegate_cur(struct xdr_stream *xdr, const struc
        __be32 *p;
 
        RESERVE_SPACE(4+NFS4_STATEID_SIZE);
-       WRITE32(NFS4_OPEN_CLAIM_DELEGATE_CUR);
+       *p++ = cpu_to_be32(NFS4_OPEN_CLAIM_DELEGATE_CUR);
        WRITEMEM(stateid->data, NFS4_STATEID_SIZE);
        encode_string(xdr, name->len, name->name);
 }
@@ -1080,6 +1255,7 @@ static void encode_open(struct xdr_stream *xdr, const struct nfs_openargs *arg,
                BUG();
        }
        hdr->nops++;
+       hdr->replen += decode_open_maxsz;
 }
 
 static void encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_confirmargs *arg, struct compound_hdr *hdr)
@@ -1087,10 +1263,11 @@ static void encode_open_confirm(struct xdr_stream *xdr, const struct nfs_open_co
        __be32 *p;
 
        RESERVE_SPACE(4+NFS4_STATEID_SIZE+4);
-       WRITE32(OP_OPEN_CONFIRM);
+       *p++ = cpu_to_be32(OP_OPEN_CONFIRM);
        WRITEMEM(arg->stateid->data, NFS4_STATEID_SIZE);
-       WRITE32(arg->seqid->sequence->counter);
+       *p++ = cpu_to_be32(arg->seqid->sequence->counter);
        hdr->nops++;
+       hdr->replen += decode_open_confirm_maxsz;
 }
 
 static void encode_open_downgrade(struct xdr_stream *xdr, const struct nfs_closeargs *arg, struct compound_hdr *hdr)
@@ -1098,11 +1275,12 @@ static void encode_open_downgrade(struct xdr_stream *xdr, const struct nfs_close
        __be32 *p;
 
        RESERVE_SPACE(4+NFS4_STATEID_SIZE+4);
-       WRITE32(OP_OPEN_DOWNGRADE);
+       *p++ = cpu_to_be32(OP_OPEN_DOWNGRADE);
        WRITEMEM(arg->stateid->data, NFS4_STATEID_SIZE);
-       WRITE32(arg->seqid->sequence->counter);
+       *p++ = cpu_to_be32(arg->seqid->sequence->counter);
        encode_share_access(xdr, arg->fmode);
        hdr->nops++;
+       hdr->replen += decode_open_downgrade_maxsz;
 }
 
 static void
@@ -1112,10 +1290,11 @@ encode_putfh(struct xdr_stream *xdr, const struct nfs_fh *fh, struct compound_hd
        __be32 *p;
 
        RESERVE_SPACE(8 + len);
-       WRITE32(OP_PUTFH);
-       WRITE32(len);
+       *p++ = cpu_to_be32(OP_PUTFH);
+       *p++ = cpu_to_be32(len);
        WRITEMEM(fh->data, len);
        hdr->nops++;
+       hdr->replen += decode_putfh_maxsz;
 }
 
 static void encode_putrootfh(struct xdr_stream *xdr, struct compound_hdr *hdr)
@@ -1123,8 +1302,9 @@ static void encode_putrootfh(struct xdr_stream *xdr, struct compound_hdr *hdr)
        __be32 *p;
 
        RESERVE_SPACE(4);
-       WRITE32(OP_PUTROOTFH);
+       *p++ = cpu_to_be32(OP_PUTROOTFH);
        hdr->nops++;
+       hdr->replen += decode_putrootfh_maxsz;
 }
 
 static void encode_stateid(struct xdr_stream *xdr, const struct nfs_open_context *ctx)
@@ -1145,14 +1325,15 @@ static void encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args,
        __be32 *p;
 
        RESERVE_SPACE(4);
-       WRITE32(OP_READ);
+       *p++ = cpu_to_be32(OP_READ);
 
        encode_stateid(xdr, args->context);
 
        RESERVE_SPACE(12);
-       WRITE64(args->offset);
-       WRITE32(args->count);
+       p = xdr_encode_hyper(p, args->offset);
+       *p++ = cpu_to_be32(args->count);
        hdr->nops++;
+       hdr->replen += decode_read_maxsz;
 }
 
 static void encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg *readdir, struct rpc_rqst *req, struct compound_hdr *hdr)
@@ -1164,20 +1345,21 @@ static void encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg
        __be32 *p;
 
        RESERVE_SPACE(12+NFS4_VERIFIER_SIZE+20);
-       WRITE32(OP_READDIR);
-       WRITE64(readdir->cookie);
+       *p++ = cpu_to_be32(OP_READDIR);
+       p = xdr_encode_hyper(p, readdir->cookie);
        WRITEMEM(readdir->verifier.data, NFS4_VERIFIER_SIZE);
-       WRITE32(readdir->count >> 1);  /* We're not doing readdirplus */
-       WRITE32(readdir->count);
-       WRITE32(2);
+       *p++ = cpu_to_be32(readdir->count >> 1);  /* We're not doing readdirplus */
+       *p++ = cpu_to_be32(readdir->count);
+       *p++ = cpu_to_be32(2);
        /* Switch to mounted_on_fileid if the server supports it */
        if (readdir->bitmask[1] & FATTR4_WORD1_MOUNTED_ON_FILEID)
                attrs[0] &= ~FATTR4_WORD0_FILEID;
        else
                attrs[1] &= ~FATTR4_WORD1_MOUNTED_ON_FILEID;
-       WRITE32(attrs[0] & readdir->bitmask[0]);
-       WRITE32(attrs[1] & readdir->bitmask[1]);
+       *p++ = cpu_to_be32(attrs[0] & readdir->bitmask[0]);
+       *p++ = cpu_to_be32(attrs[1] & readdir->bitmask[1]);
        hdr->nops++;
+       hdr->replen += decode_readdir_maxsz;
        dprintk("%s: cookie = %Lu, verifier = %08x:%08x, bitmap = %08x:%08x\n",
                        __func__,
                        (unsigned long long)readdir->cookie,
@@ -1192,8 +1374,9 @@ static void encode_readlink(struct xdr_stream *xdr, const struct nfs4_readlink *
        __be32 *p;
 
        RESERVE_SPACE(4);
-       WRITE32(OP_READLINK);
+       *p++ = cpu_to_be32(OP_READLINK);
        hdr->nops++;
+       hdr->replen += decode_readlink_maxsz;
 }
 
 static void encode_remove(struct xdr_stream *xdr, const struct qstr *name, struct compound_hdr *hdr)
@@ -1201,10 +1384,11 @@ static void encode_remove(struct xdr_stream *xdr, const struct qstr *name, struc
        __be32 *p;
 
        RESERVE_SPACE(8 + name->len);
-       WRITE32(OP_REMOVE);
-       WRITE32(name->len);
+       *p++ = cpu_to_be32(OP_REMOVE);
+       *p++ = cpu_to_be32(name->len);
        WRITEMEM(name->name, name->len);
        hdr->nops++;
+       hdr->replen += decode_remove_maxsz;
 }
 
 static void encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, const struct qstr *newname, struct compound_hdr *hdr)
@@ -1212,14 +1396,15 @@ static void encode_rename(struct xdr_stream *xdr, const struct qstr *oldname, co
        __be32 *p;
 
        RESERVE_SPACE(8 + oldname->len);
-       WRITE32(OP_RENAME);
-       WRITE32(oldname->len);
+       *p++ = cpu_to_be32(OP_RENAME);
+       *p++ = cpu_to_be32(oldname->len);
        WRITEMEM(oldname->name, oldname->len);
 
        RESERVE_SPACE(4 + newname->len);
-       WRITE32(newname->len);
+       *p++ = cpu_to_be32(newname->len);
        WRITEMEM(newname->name, newname->len);
        hdr->nops++;
+       hdr->replen += decode_rename_maxsz;
 }
 
 static void encode_renew(struct xdr_stream *xdr, const struct nfs_client *client_stateid, struct compound_hdr *hdr)
@@ -1227,9 +1412,10 @@ static void encode_renew(struct xdr_stream *xdr, const struct nfs_client *client
        __be32 *p;
 
        RESERVE_SPACE(12);
-       WRITE32(OP_RENEW);
-       WRITE64(client_stateid->cl_clientid);
+       *p++ = cpu_to_be32(OP_RENEW);
+       p = xdr_encode_hyper(p, client_stateid->cl_clientid);
        hdr->nops++;
+       hdr->replen += decode_renew_maxsz;
 }
 
 static void
@@ -1238,8 +1424,9 @@ encode_restorefh(struct xdr_stream *xdr, struct compound_hdr *hdr)
        __be32 *p;
 
        RESERVE_SPACE(4);
-       WRITE32(OP_RESTOREFH);
+       *p++ = cpu_to_be32(OP_RESTOREFH);
        hdr->nops++;
+       hdr->replen += decode_restorefh_maxsz;
 }
 
 static int
@@ -1248,17 +1435,18 @@ encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg, struct compoun
        __be32 *p;
 
        RESERVE_SPACE(4+NFS4_STATEID_SIZE);
-       WRITE32(OP_SETATTR);
+       *p++ = cpu_to_be32(OP_SETATTR);
        WRITEMEM(zero_stateid.data, NFS4_STATEID_SIZE);
        RESERVE_SPACE(2*4);
-       WRITE32(1);
-       WRITE32(FATTR4_WORD0_ACL);
+       *p++ = cpu_to_be32(1);
+       *p++ = cpu_to_be32(FATTR4_WORD0_ACL);
        if (arg->acl_len % 4)
                return -EINVAL;
        RESERVE_SPACE(4);
-       WRITE32(arg->acl_len);
+       *p++ = cpu_to_be32(arg->acl_len);
        xdr_write_pages(xdr, arg->acl_pages, arg->acl_pgbase, arg->acl_len);
        hdr->nops++;
+       hdr->replen += decode_setacl_maxsz;
        return 0;
 }
 
@@ -1268,8 +1456,9 @@ encode_savefh(struct xdr_stream *xdr, struct compound_hdr *hdr)
        __be32 *p;
 
        RESERVE_SPACE(4);
-       WRITE32(OP_SAVEFH);
+       *p++ = cpu_to_be32(OP_SAVEFH);
        hdr->nops++;
+       hdr->replen += decode_savefh_maxsz;
 }
 
 static void encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs *arg, const struct nfs_server *server, struct compound_hdr *hdr)
@@ -1277,9 +1466,10 @@ static void encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs
        __be32 *p;
 
        RESERVE_SPACE(4+NFS4_STATEID_SIZE);
-       WRITE32(OP_SETATTR);
+       *p++ = cpu_to_be32(OP_SETATTR);
        WRITEMEM(arg->stateid.data, NFS4_STATEID_SIZE);
        hdr->nops++;
+       hdr->replen += decode_setattr_maxsz;
        encode_attrs(xdr, arg->iap, server);
 }
 
@@ -1288,17 +1478,18 @@ static void encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclie
        __be32 *p;
 
        RESERVE_SPACE(4 + NFS4_VERIFIER_SIZE);
-       WRITE32(OP_SETCLIENTID);
+       *p++ = cpu_to_be32(OP_SETCLIENTID);
        WRITEMEM(setclientid->sc_verifier->data, NFS4_VERIFIER_SIZE);
 
        encode_string(xdr, setclientid->sc_name_len, setclientid->sc_name);
        RESERVE_SPACE(4);
-       WRITE32(setclientid->sc_prog);
+       *p++ = cpu_to_be32(setclientid->sc_prog);
        encode_string(xdr, setclientid->sc_netid_len, setclientid->sc_netid);
        encode_string(xdr, setclientid->sc_uaddr_len, setclientid->sc_uaddr);
        RESERVE_SPACE(4);
-       WRITE32(setclientid->sc_cb_ident);
+       *p++ = cpu_to_be32(setclientid->sc_cb_ident);
        hdr->nops++;
+       hdr->replen += decode_setclientid_maxsz;
 }
 
 static void encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs_client *client_state, struct compound_hdr *hdr)
@@ -1306,10 +1497,11 @@ static void encode_setclientid_confirm(struct xdr_stream *xdr, const struct nfs_
        __be32 *p;
 
        RESERVE_SPACE(12 + NFS4_VERIFIER_SIZE);
-       WRITE32(OP_SETCLIENTID_CONFIRM);
-       WRITE64(client_state->cl_clientid);
+       *p++ = cpu_to_be32(OP_SETCLIENTID_CONFIRM);
+       p = xdr_encode_hyper(p, client_state->cl_clientid);
        WRITEMEM(client_state->cl_confirm.data, NFS4_VERIFIER_SIZE);
        hdr->nops++;
+       hdr->replen += decode_setclientid_confirm_maxsz;
 }
 
 static void encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *args, struct compound_hdr *hdr)
@@ -1317,17 +1509,18 @@ static void encode_write(struct xdr_stream *xdr, const struct nfs_writeargs *arg
        __be32 *p;
 
        RESERVE_SPACE(4);
-       WRITE32(OP_WRITE);
+       *p++ = cpu_to_be32(OP_WRITE);
 
        encode_stateid(xdr, args->context);
 
        RESERVE_SPACE(16);
-       WRITE64(args->offset);
-       WRITE32(args->stable);
-       WRITE32(args->count);
+       p = xdr_encode_hyper(p, args->offset);
+       *p++ = cpu_to_be32(args->stable);
+       *p++ = cpu_to_be32(args->count);
 
        xdr_write_pages(xdr, args->pages, args->pgbase, args->count);
        hdr->nops++;
+       hdr->replen += decode_write_maxsz;
 }
 
 static void encode_delegreturn(struct xdr_stream *xdr, const nfs4_stateid *stateid, struct compound_hdr *hdr)
@@ -1336,14 +1529,166 @@ static void encode_delegreturn(struct xdr_stream *xdr, const nfs4_stateid *state
 
        RESERVE_SPACE(4+NFS4_STATEID_SIZE);
 
-       WRITE32(OP_DELEGRETURN);
+       *p++ = cpu_to_be32(OP_DELEGRETURN);
        WRITEMEM(stateid->data, NFS4_STATEID_SIZE);
        hdr->nops++;
+       hdr->replen += decode_delegreturn_maxsz;
 }
+
+#if defined(CONFIG_NFS_V4_1)
+/* NFSv4.1 operations */
+static void encode_exchange_id(struct xdr_stream *xdr,
+                              struct nfs41_exchange_id_args *args,
+                              struct compound_hdr *hdr)
+{
+       __be32 *p;
+
+       RESERVE_SPACE(4 + sizeof(args->verifier->data));
+       *p++ = cpu_to_be32(OP_EXCHANGE_ID);
+       WRITEMEM(args->verifier->data, sizeof(args->verifier->data));
+
+       encode_string(xdr, args->id_len, args->id);
+
+       RESERVE_SPACE(12);
+       *p++ = cpu_to_be32(args->flags);
+       *p++ = cpu_to_be32(0);  /* zero length state_protect4_a */
+       *p++ = cpu_to_be32(0);  /* zero length implementation id array */
+       hdr->nops++;
+       hdr->replen += decode_exchange_id_maxsz;
+}
+
+static void encode_create_session(struct xdr_stream *xdr,
+                                 struct nfs41_create_session_args *args,
+                                 struct compound_hdr *hdr)
+{
+       __be32 *p;
+       char machine_name[NFS4_MAX_MACHINE_NAME_LEN];
+       uint32_t len;
+       struct nfs_client *clp = args->client;
+
+       RESERVE_SPACE(4);
+       *p++ = cpu_to_be32(OP_CREATE_SESSION);
+
+       RESERVE_SPACE(8);
+       p = xdr_encode_hyper(p, clp->cl_ex_clid);
+
+       RESERVE_SPACE(8);
+       *p++ = cpu_to_be32(clp->cl_seqid);                      /*Sequence id */
+       *p++ = cpu_to_be32(args->flags);                        /*flags */
+
+       RESERVE_SPACE(2*28);                    /* 2 channel_attrs */
+       /* Fore Channel */
+       *p++ = cpu_to_be32(args->fc_attrs.headerpadsz); /* header padding size */
+       *p++ = cpu_to_be32(args->fc_attrs.max_rqst_sz); /* max req size */
+       *p++ = cpu_to_be32(args->fc_attrs.max_resp_sz); /* max resp size */
+       *p++ = cpu_to_be32(args->fc_attrs.max_resp_sz_cached);  /* Max resp sz cached */
+       *p++ = cpu_to_be32(args->fc_attrs.max_ops);     /* max operations */
+       *p++ = cpu_to_be32(args->fc_attrs.max_reqs);    /* max requests */
+       *p++ = cpu_to_be32(0);                          /* rdmachannel_attrs */
+
+       /* Back Channel */
+       *p++ = cpu_to_be32(args->fc_attrs.headerpadsz); /* header padding size */
+       *p++ = cpu_to_be32(args->bc_attrs.max_rqst_sz); /* max req size */
+       *p++ = cpu_to_be32(args->bc_attrs.max_resp_sz); /* max resp size */
+       *p++ = cpu_to_be32(args->bc_attrs.max_resp_sz_cached);  /* Max resp sz cached */
+       *p++ = cpu_to_be32(args->bc_attrs.max_ops);     /* max operations */
+       *p++ = cpu_to_be32(args->bc_attrs.max_reqs);    /* max requests */
+       *p++ = cpu_to_be32(0);                          /* rdmachannel_attrs */
+
+       RESERVE_SPACE(4);
+       *p++ = cpu_to_be32(args->cb_program);           /* cb_program */
+
+       RESERVE_SPACE(4);                       /* # of security flavors */
+       *p++ = cpu_to_be32(1);
+
+       RESERVE_SPACE(4);
+       *p++ = cpu_to_be32(RPC_AUTH_UNIX);                      /* auth_sys */
+
+       /* authsys_parms rfc1831 */
+       RESERVE_SPACE(4);
+       *p++ = cpu_to_be32((u32)clp->cl_boot_time.tv_nsec);     /* stamp */
+       len = scnprintf(machine_name, sizeof(machine_name), "%s",
+                       clp->cl_ipaddr);
+       RESERVE_SPACE(16 + len);
+       *p++ = cpu_to_be32(len);
+       WRITEMEM(machine_name, len);
+       *p++ = cpu_to_be32(0);                          /* UID */
+       *p++ = cpu_to_be32(0);                          /* GID */
+       *p++ = cpu_to_be32(0);                          /* No more gids */
+       hdr->nops++;
+       hdr->replen += decode_create_session_maxsz;
+}
+
+static void encode_destroy_session(struct xdr_stream *xdr,
+                                  struct nfs4_session *session,
+                                  struct compound_hdr *hdr)
+{
+       __be32 *p;
+       RESERVE_SPACE(4 + NFS4_MAX_SESSIONID_LEN);
+       *p++ = cpu_to_be32(OP_DESTROY_SESSION);
+       WRITEMEM(session->sess_id.data, NFS4_MAX_SESSIONID_LEN);
+       hdr->nops++;
+       hdr->replen += decode_destroy_session_maxsz;
+}
+#endif /* CONFIG_NFS_V4_1 */
+
+static void encode_sequence(struct xdr_stream *xdr,
+                           const struct nfs4_sequence_args *args,
+                           struct compound_hdr *hdr)
+{
+#if defined(CONFIG_NFS_V4_1)
+       struct nfs4_session *session = args->sa_session;
+       struct nfs4_slot_table *tp;
+       struct nfs4_slot *slot;
+       __be32 *p;
+
+       if (!session)
+               return;
+
+       tp = &session->fc_slot_table;
+
+       WARN_ON(args->sa_slotid == NFS4_MAX_SLOT_TABLE);
+       slot = tp->slots + args->sa_slotid;
+
+       RESERVE_SPACE(4);
+       *p++ = cpu_to_be32(OP_SEQUENCE);
+
+       /*
+        * Sessionid + seqid + slotid + max slotid + cache_this
+        */
+       dprintk("%s: sessionid=%u:%u:%u:%u seqid=%d slotid=%d "
+               "max_slotid=%d cache_this=%d\n",
+               __func__,
+               ((u32 *)session->sess_id.data)[0],
+               ((u32 *)session->sess_id.data)[1],
+               ((u32 *)session->sess_id.data)[2],
+               ((u32 *)session->sess_id.data)[3],
+               slot->seq_nr, args->sa_slotid,
+               tp->highest_used_slotid, args->sa_cache_this);
+       RESERVE_SPACE(NFS4_MAX_SESSIONID_LEN + 16);
+       WRITEMEM(session->sess_id.data, NFS4_MAX_SESSIONID_LEN);
+       *p++ = cpu_to_be32(slot->seq_nr);
+       *p++ = cpu_to_be32(args->sa_slotid);
+       *p++ = cpu_to_be32(tp->highest_used_slotid);
+       *p++ = cpu_to_be32(args->sa_cache_this);
+       hdr->nops++;
+       hdr->replen += decode_sequence_maxsz;
+#endif /* CONFIG_NFS_V4_1 */
+}
+
 /*
  * END OF "GENERIC" ENCODE ROUTINES.
  */
 
+static u32 nfs4_xdr_minorversion(const struct nfs4_sequence_args *args)
+{
+#if defined(CONFIG_NFS_V4_1)
+       if (args->sa_session)
+               return args->sa_session->clp->cl_minorversion;
+#endif /* CONFIG_NFS_V4_1 */
+       return 0;
+}
+
 /*
  * Encode an ACCESS request
  */
@@ -1351,11 +1696,12 @@ static int nfs4_xdr_enc_access(struct rpc_rqst *req, __be32 *p, const struct nfs
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_access(&xdr, args->access, &hdr);
        encode_getfattr(&xdr, args->bitmask, &hdr);
@@ -1370,11 +1716,12 @@ static int nfs4_xdr_enc_lookup(struct rpc_rqst *req, __be32 *p, const struct nfs
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->dir_fh, &hdr);
        encode_lookup(&xdr, args->name, &hdr);
        encode_getfh(&xdr, &hdr);
@@ -1390,11 +1737,12 @@ static int nfs4_xdr_enc_lookup_root(struct rpc_rqst *req, __be32 *p, const struc
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putrootfh(&xdr, &hdr);
        encode_getfh(&xdr, &hdr);
        encode_getfattr(&xdr, args->bitmask, &hdr);
@@ -1409,11 +1757,12 @@ static int nfs4_xdr_enc_remove(struct rpc_rqst *req, __be32 *p, const struct nfs
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_remove(&xdr, &args->name, &hdr);
        encode_getfattr(&xdr, args->bitmask, &hdr);
@@ -1428,11 +1777,12 @@ static int nfs4_xdr_enc_rename(struct rpc_rqst *req, __be32 *p, const struct nfs
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->old_dir, &hdr);
        encode_savefh(&xdr, &hdr);
        encode_putfh(&xdr, args->new_dir, &hdr);
@@ -1451,11 +1801,12 @@ static int nfs4_xdr_enc_link(struct rpc_rqst *req, __be32 *p, const struct nfs4_
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_savefh(&xdr, &hdr);
        encode_putfh(&xdr, args->dir_fh, &hdr);
@@ -1474,11 +1825,12 @@ static int nfs4_xdr_enc_create(struct rpc_rqst *req, __be32 *p, const struct nfs
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->dir_fh, &hdr);
        encode_savefh(&xdr, &hdr);
        encode_create(&xdr, args, &hdr);
@@ -1505,11 +1857,12 @@ static int nfs4_xdr_enc_getattr(struct rpc_rqst *req, __be32 *p, const struct nf
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_getfattr(&xdr, args->bitmask, &hdr);
        encode_nops(&hdr);
@@ -1523,11 +1876,12 @@ static int nfs4_xdr_enc_close(struct rpc_rqst *req, __be32 *p, struct nfs_closea
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops   = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_close(&xdr, args, &hdr);
        encode_getfattr(&xdr, args->bitmask, &hdr);
@@ -1542,11 +1896,12 @@ static int nfs4_xdr_enc_open(struct rpc_rqst *req, __be32 *p, struct nfs_openarg
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_savefh(&xdr, &hdr);
        encode_open(&xdr, args, &hdr);
@@ -1569,7 +1924,7 @@ static int nfs4_xdr_enc_open_confirm(struct rpc_rqst *req, __be32 *p, struct nfs
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_open_confirm(&xdr, args, &hdr);
        encode_nops(&hdr);
@@ -1583,11 +1938,12 @@ static int nfs4_xdr_enc_open_noattr(struct rpc_rqst *req, __be32 *p, struct nfs_
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops   = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_open(&xdr, args, &hdr);
        encode_getfattr(&xdr, args->bitmask, &hdr);
@@ -1602,11 +1958,12 @@ static int nfs4_xdr_enc_open_downgrade(struct rpc_rqst *req, __be32 *p, struct n
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops   = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_open_downgrade(&xdr, args, &hdr);
        encode_getfattr(&xdr, args->bitmask, &hdr);
@@ -1621,11 +1978,12 @@ static int nfs4_xdr_enc_lock(struct rpc_rqst *req, __be32 *p, struct nfs_lock_ar
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops   = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_lock(&xdr, args, &hdr);
        encode_nops(&hdr);
@@ -1639,11 +1997,12 @@ static int nfs4_xdr_enc_lockt(struct rpc_rqst *req, __be32 *p, struct nfs_lockt_
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops   = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_lockt(&xdr, args, &hdr);
        encode_nops(&hdr);
@@ -1657,11 +2016,12 @@ static int nfs4_xdr_enc_locku(struct rpc_rqst *req, __be32 *p, struct nfs_locku_
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops   = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_locku(&xdr, args, &hdr);
        encode_nops(&hdr);
@@ -1675,22 +2035,16 @@ static int nfs4_xdr_enc_readlink(struct rpc_rqst *req, __be32 *p, const struct n
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
-       struct rpc_auth *auth = req->rq_task->tk_msg.rpc_cred->cr_auth;
-       unsigned int replen;
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_readlink(&xdr, args, req, &hdr);
 
-       /* set up reply kvec
-        *    toplevel_status + taglen + rescount + OP_PUTFH + status
-        *      + OP_READLINK + status + string length = 8
-        */
-       replen = (RPC_REPHDRSIZE + auth->au_rslack + NFS4_dec_readlink_sz) << 2;
-       xdr_inline_pages(&req->rq_rcv_buf, replen, args->pages,
+       xdr_inline_pages(&req->rq_rcv_buf, hdr.replen << 2, args->pages,
                        args->pgbase, args->pglen);
        encode_nops(&hdr);
        return 0;
@@ -1703,25 +2057,19 @@ static int nfs4_xdr_enc_readdir(struct rpc_rqst *req, __be32 *p, const struct nf
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
-       struct rpc_auth *auth = req->rq_task->tk_msg.rpc_cred->cr_auth;
-       int replen;
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_readdir(&xdr, args, req, &hdr);
 
-       /* set up reply kvec
-        *    toplevel_status + taglen + rescount + OP_PUTFH + status
-        *      + OP_READDIR + status + verifer(2)  = 9
-        */
-       replen = (RPC_REPHDRSIZE + auth->au_rslack + NFS4_dec_readdir_sz) << 2;
-       xdr_inline_pages(&req->rq_rcv_buf, replen, args->pages,
+       xdr_inline_pages(&req->rq_rcv_buf, hdr.replen << 2, args->pages,
                         args->pgbase, args->count);
        dprintk("%s: inlined page args = (%u, %p, %u, %u)\n",
-                       __func__, replen, args->pages,
+                       __func__, hdr.replen << 2, args->pages,
                        args->pgbase, args->count);
        encode_nops(&hdr);
        return 0;
@@ -1732,24 +2080,18 @@ static int nfs4_xdr_enc_readdir(struct rpc_rqst *req, __be32 *p, const struct nf
  */
 static int nfs4_xdr_enc_read(struct rpc_rqst *req, __be32 *p, struct nfs_readargs *args)
 {
-       struct rpc_auth *auth = req->rq_task->tk_msg.rpc_cred->cr_auth;
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
-       int replen;
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_read(&xdr, args, &hdr);
 
-       /* set up reply kvec
-        *    toplevel status + taglen=0 + rescount + OP_PUTFH + status
-        *       + OP_READ + status + eof + datalen = 9
-        */
-       replen = (RPC_REPHDRSIZE + auth->au_rslack + NFS4_dec_read_sz) << 2;
-       xdr_inline_pages(&req->rq_rcv_buf, replen,
+       xdr_inline_pages(&req->rq_rcv_buf, hdr.replen << 2,
                         args->pages, args->pgbase, args->count);
        req->rq_rcv_buf.flags |= XDRBUF_READ;
        encode_nops(&hdr);
@@ -1763,11 +2105,12 @@ static int nfs4_xdr_enc_setattr(struct rpc_rqst *req, __be32 *p, struct nfs_seta
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops   = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_setattr(&xdr, args, args->server, &hdr);
        encode_getfattr(&xdr, args->bitmask, &hdr);
@@ -1783,20 +2126,19 @@ nfs4_xdr_enc_getacl(struct rpc_rqst *req, __be32 *p,
                struct nfs_getaclargs *args)
 {
        struct xdr_stream xdr;
-       struct rpc_auth *auth = req->rq_task->tk_msg.rpc_cred->cr_auth;
        struct compound_hdr hdr = {
-               .nops   = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
-       int replen;
+       uint32_t replen;
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
+       replen = hdr.replen + nfs4_fattr_bitmap_maxsz + 1;
        encode_getattr_two(&xdr, FATTR4_WORD0_ACL, 0, &hdr);
 
-       /* set up reply buffer: */
-       replen = (RPC_REPHDRSIZE + auth->au_rslack + NFS4_dec_getacl_sz) << 2;
-       xdr_inline_pages(&req->rq_rcv_buf, replen,
+       xdr_inline_pages(&req->rq_rcv_buf, replen << 2,
                args->acl_pages, args->acl_pgbase, args->acl_len);
        encode_nops(&hdr);
        return 0;
@@ -1809,11 +2151,12 @@ static int nfs4_xdr_enc_write(struct rpc_rqst *req, __be32 *p, struct nfs_writea
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_write(&xdr, args, &hdr);
        req->rq_snd_buf.flags |= XDRBUF_WRITE;
@@ -1829,11 +2172,12 @@ static int nfs4_xdr_enc_commit(struct rpc_rqst *req, __be32 *p, struct nfs_write
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_commit(&xdr, args, &hdr);
        encode_getfattr(&xdr, args->bitmask, &hdr);
@@ -1848,11 +2192,12 @@ static int nfs4_xdr_enc_fsinfo(struct rpc_rqst *req, __be32 *p, struct nfs4_fsin
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops   = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_fsinfo(&xdr, args->bitmask, &hdr);
        encode_nops(&hdr);
@@ -1866,11 +2211,12 @@ static int nfs4_xdr_enc_pathconf(struct rpc_rqst *req, __be32 *p, const struct n
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_getattr_one(&xdr, args->bitmask[0] & nfs4_pathconf_bitmap[0],
                           &hdr);
@@ -1885,11 +2231,12 @@ static int nfs4_xdr_enc_statfs(struct rpc_rqst *req, __be32 *p, const struct nfs
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        encode_getattr_two(&xdr, args->bitmask[0] & nfs4_statfs_bitmap[0],
                           args->bitmask[1] & nfs4_statfs_bitmap[1], &hdr);
@@ -1905,11 +2252,12 @@ static int nfs4_xdr_enc_server_caps(struct rpc_rqst *req, __be32 *p,
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fhandle, &hdr);
        encode_getattr_one(&xdr, FATTR4_WORD0_SUPPORTED_ATTRS|
                           FATTR4_WORD0_LINK_SUPPORT|
@@ -1930,7 +2278,7 @@ static int nfs4_xdr_enc_renew(struct rpc_rqst *req, __be32 *p, struct nfs_client
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
        encode_renew(&xdr, clp, &hdr);
        encode_nops(&hdr);
        return 0;
@@ -1947,7 +2295,7 @@ static int nfs4_xdr_enc_setclientid(struct rpc_rqst *req, __be32 *p, struct nfs4
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
        encode_setclientid(&xdr, sc, &hdr);
        encode_nops(&hdr);
        return 0;
@@ -1965,7 +2313,7 @@ static int nfs4_xdr_enc_setclientid_confirm(struct rpc_rqst *req, __be32 *p, str
        const u32 lease_bitmap[2] = { FATTR4_WORD0_LEASE_TIME, 0 };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
        encode_setclientid_confirm(&xdr, clp, &hdr);
        encode_putrootfh(&xdr, &hdr);
        encode_fsinfo(&xdr, lease_bitmap, &hdr);
@@ -1980,11 +2328,12 @@ static int nfs4_xdr_enc_delegreturn(struct rpc_rqst *req, __be32 *p, const struc
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fhandle, &hdr);
        encode_delegreturn(&xdr, args->stateid, &hdr);
        encode_getfattr(&xdr, args->bitmask, &hdr);
@@ -1999,28 +2348,119 @@ static int nfs4_xdr_enc_fs_locations(struct rpc_rqst *req, __be32 *p, struct nfs
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
-       struct rpc_auth *auth = req->rq_task->tk_msg.rpc_cred->cr_auth;
-       int replen;
+       uint32_t replen;
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->dir_fh, &hdr);
        encode_lookup(&xdr, args->name, &hdr);
+       replen = hdr.replen;    /* get the attribute into args->page */
        encode_fs_locations(&xdr, args->bitmask, &hdr);
 
-       /* set up reply
-        *   toplevel_status + OP_PUTFH + status
-        *   + OP_LOOKUP + status + OP_GETATTR + status = 7
-        */
-       replen = (RPC_REPHDRSIZE + auth->au_rslack + 7) << 2;
-       xdr_inline_pages(&req->rq_rcv_buf, replen, &args->page,
+       xdr_inline_pages(&req->rq_rcv_buf, replen << 2, &args->page,
                        0, PAGE_SIZE);
        encode_nops(&hdr);
        return 0;
 }
 
+#if defined(CONFIG_NFS_V4_1)
+/*
+ * EXCHANGE_ID request
+ */
+static int nfs4_xdr_enc_exchange_id(struct rpc_rqst *req, uint32_t *p,
+                                   struct nfs41_exchange_id_args *args)
+{
+       struct xdr_stream xdr;
+       struct compound_hdr hdr = {
+               .minorversion = args->client->cl_minorversion,
+       };
+
+       xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_exchange_id(&xdr, args, &hdr);
+       encode_nops(&hdr);
+       return 0;
+}
+
+/*
+ * a CREATE_SESSION request
+ */
+static int nfs4_xdr_enc_create_session(struct rpc_rqst *req, uint32_t *p,
+                                      struct nfs41_create_session_args *args)
+{
+       struct xdr_stream xdr;
+       struct compound_hdr hdr = {
+               .minorversion = args->client->cl_minorversion,
+       };
+
+       xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_create_session(&xdr, args, &hdr);
+       encode_nops(&hdr);
+       return 0;
+}
+
+/*
+ * a DESTROY_SESSION request
+ */
+static int nfs4_xdr_enc_destroy_session(struct rpc_rqst *req, uint32_t *p,
+                                       struct nfs4_session *session)
+{
+       struct xdr_stream xdr;
+       struct compound_hdr hdr = {
+               .minorversion = session->clp->cl_minorversion,
+       };
+
+       xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_destroy_session(&xdr, session, &hdr);
+       encode_nops(&hdr);
+       return 0;
+}
+
+/*
+ * a SEQUENCE request
+ */
+static int nfs4_xdr_enc_sequence(struct rpc_rqst *req, uint32_t *p,
+                                struct nfs4_sequence_args *args)
+{
+       struct xdr_stream xdr;
+       struct compound_hdr hdr = {
+               .minorversion = nfs4_xdr_minorversion(args),
+       };
+
+       xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, args, &hdr);
+       encode_nops(&hdr);
+       return 0;
+}
+
+/*
+ * a GET_LEASE_TIME request
+ */
+static int nfs4_xdr_enc_get_lease_time(struct rpc_rqst *req, uint32_t *p,
+                                      struct nfs4_get_lease_time_args *args)
+{
+       struct xdr_stream xdr;
+       struct compound_hdr hdr = {
+               .minorversion = nfs4_xdr_minorversion(&args->la_seq_args),
+       };
+       const u32 lease_bitmap[2] = { FATTR4_WORD0_LEASE_TIME, 0 };
+
+       xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->la_seq_args, &hdr);
+       encode_putrootfh(&xdr, &hdr);
+       encode_fsinfo(&xdr, lease_bitmap, &hdr);
+       encode_nops(&hdr);
+       return 0;
+}
+#endif /* CONFIG_NFS_V4_1 */
+
 /*
  * START OF "GENERIC" DECODE ROUTINES.
  *   These may look a little ugly since they are imported from a "generic"
@@ -3658,7 +4098,7 @@ decode_savefh(struct xdr_stream *xdr)
        return decode_op_hdr(xdr, OP_SAVEFH);
 }
 
-static int decode_setattr(struct xdr_stream *xdr, struct nfs_setattrres *res)
+static int decode_setattr(struct xdr_stream *xdr)
 {
        __be32 *p;
        uint32_t bmlen;
@@ -3736,6 +4176,169 @@ static int decode_delegreturn(struct xdr_stream *xdr)
        return decode_op_hdr(xdr, OP_DELEGRETURN);
 }
 
+#if defined(CONFIG_NFS_V4_1)
+static int decode_exchange_id(struct xdr_stream *xdr,
+                             struct nfs41_exchange_id_res *res)
+{
+       __be32 *p;
+       uint32_t dummy;
+       int status;
+       struct nfs_client *clp = res->client;
+
+       status = decode_op_hdr(xdr, OP_EXCHANGE_ID);
+       if (status)
+               return status;
+
+       READ_BUF(8);
+       READ64(clp->cl_ex_clid);
+       READ_BUF(12);
+       READ32(clp->cl_seqid);
+       READ32(clp->cl_exchange_flags);
+
+       /* We ask for SP4_NONE */
+       READ32(dummy);
+       if (dummy != SP4_NONE)
+               return -EIO;
+
+       /* Throw away minor_id */
+       READ_BUF(8);
+
+       /* Throw away Major id */
+       READ_BUF(4);
+       READ32(dummy);
+       READ_BUF(dummy);
+
+       /* Throw away server_scope */
+       READ_BUF(4);
+       READ32(dummy);
+       READ_BUF(dummy);
+
+       /* Throw away Implementation id array */
+       READ_BUF(4);
+       READ32(dummy);
+       READ_BUF(dummy);
+
+       return 0;
+}
+
+static int decode_chan_attrs(struct xdr_stream *xdr,
+                            struct nfs4_channel_attrs *attrs)
+{
+       __be32 *p;
+       u32 nr_attrs;
+
+       READ_BUF(28);
+       READ32(attrs->headerpadsz);
+       READ32(attrs->max_rqst_sz);
+       READ32(attrs->max_resp_sz);
+       READ32(attrs->max_resp_sz_cached);
+       READ32(attrs->max_ops);
+       READ32(attrs->max_reqs);
+       READ32(nr_attrs);
+       if (unlikely(nr_attrs > 1)) {
+               printk(KERN_WARNING "%s: Invalid rdma channel attrs count %u\n",
+                       __func__, nr_attrs);
+               return -EINVAL;
+       }
+       if (nr_attrs == 1)
+               READ_BUF(4); /* skip rdma_attrs */
+       return 0;
+}
+
+static int decode_create_session(struct xdr_stream *xdr,
+                                struct nfs41_create_session_res *res)
+{
+       __be32 *p;
+       int status;
+       struct nfs_client *clp = res->client;
+       struct nfs4_session *session = clp->cl_session;
+
+       status = decode_op_hdr(xdr, OP_CREATE_SESSION);
+
+       if (status)
+               return status;
+
+       /* sessionid */
+       READ_BUF(NFS4_MAX_SESSIONID_LEN);
+       COPYMEM(&session->sess_id, NFS4_MAX_SESSIONID_LEN);
+
+       /* seqid, flags */
+       READ_BUF(8);
+       READ32(clp->cl_seqid);
+       READ32(session->flags);
+
+       /* Channel attributes */
+       status = decode_chan_attrs(xdr, &session->fc_attrs);
+       if (!status)
+               status = decode_chan_attrs(xdr, &session->bc_attrs);
+       return status;
+}
+
+static int decode_destroy_session(struct xdr_stream *xdr, void *dummy)
+{
+       return decode_op_hdr(xdr, OP_DESTROY_SESSION);
+}
+#endif /* CONFIG_NFS_V4_1 */
+
+static int decode_sequence(struct xdr_stream *xdr,
+                          struct nfs4_sequence_res *res,
+                          struct rpc_rqst *rqstp)
+{
+#if defined(CONFIG_NFS_V4_1)
+       struct nfs4_slot *slot;
+       struct nfs4_sessionid id;
+       u32 dummy;
+       int status;
+       __be32 *p;
+
+       if (!res->sr_session)
+               return 0;
+
+       status = decode_op_hdr(xdr, OP_SEQUENCE);
+       if (status)
+               goto out_err;
+
+       /*
+        * If the server returns different values for sessionID, slotID or
+        * sequence number, the server is looney tunes.
+        */
+       status = -ESERVERFAULT;
+
+       slot = &res->sr_session->fc_slot_table.slots[res->sr_slotid];
+       READ_BUF(NFS4_MAX_SESSIONID_LEN + 20);
+       COPYMEM(id.data, NFS4_MAX_SESSIONID_LEN);
+       if (memcmp(id.data, res->sr_session->sess_id.data,
+                  NFS4_MAX_SESSIONID_LEN)) {
+               dprintk("%s Invalid session id\n", __func__);
+               goto out_err;
+       }
+       /* seqid */
+       READ32(dummy);
+       if (dummy != slot->seq_nr) {
+               dprintk("%s Invalid sequence number\n", __func__);
+               goto out_err;
+       }
+       /* slot id */
+       READ32(dummy);
+       if (dummy != res->sr_slotid) {
+               dprintk("%s Invalid slot id\n", __func__);
+               goto out_err;
+       }
+       /* highest slot id - currently not processed */
+       READ32(dummy);
+       /* target highest slot id - currently not processed */
+       READ32(dummy);
+       /* result flags - currently not processed */
+       READ32(dummy);
+       status = 0;
+out_err:
+       res->sr_status = status;
+       return status;
+#else  /* CONFIG_NFS_V4_1 */
+       return 0;
+#endif /* CONFIG_NFS_V4_1 */
+}
+
 /*
  * END OF "GENERIC" DECODE ROUTINES.
  */
@@ -3753,6 +4356,9 @@ static int nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, __be32 *p, struct
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -3774,7 +4380,11 @@ static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_ac
        int status;
 
        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
-       if ((status = decode_compound_hdr(&xdr, &hdr)) != 0)
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (status)
+               goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
                goto out;
        status = decode_putfh(&xdr);
        if (status != 0)
@@ -3797,7 +4407,11 @@ static int nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_lo
        int status;
 
        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
-       if ((status = decode_compound_hdr(&xdr, &hdr)) != 0)
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (status)
+               goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
                goto out;
        if ((status = decode_putfh(&xdr)) != 0)
                goto out;
@@ -3820,7 +4434,11 @@ static int nfs4_xdr_dec_lookup_root(struct rpc_rqst *rqstp, __be32 *p, struct nf
        int status;
 
        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
-       if ((status = decode_compound_hdr(&xdr, &hdr)) != 0)
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (status)
+               goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
                goto out;
        if ((status = decode_putrootfh(&xdr)) != 0)
                goto out;
@@ -3840,7 +4458,11 @@ static int nfs4_xdr_dec_remove(struct rpc_rqst *rqstp, __be32 *p, struct nfs_rem
        int status;
 
        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
-       if ((status = decode_compound_hdr(&xdr, &hdr)) != 0)
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (status)
+               goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
                goto out;
        if ((status = decode_putfh(&xdr)) != 0)
                goto out;
@@ -3861,7 +4483,11 @@ static int nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_re
        int status;
 
        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
-       if ((status = decode_compound_hdr(&xdr, &hdr)) != 0)
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (status)
+               goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
                goto out;
        if ((status = decode_putfh(&xdr)) != 0)
                goto out;
@@ -3891,7 +4517,11 @@ static int nfs4_xdr_dec_link(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_link
        int status;
 
        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
-       if ((status = decode_compound_hdr(&xdr, &hdr)) != 0)
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (status)
+               goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
                goto out;
        if ((status = decode_putfh(&xdr)) != 0)
                goto out;
@@ -3924,7 +4554,11 @@ static int nfs4_xdr_dec_create(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_cr
        int status;
 
        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
-       if ((status = decode_compound_hdr(&xdr, &hdr)) != 0)
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (status)
+               goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
                goto out;
        if ((status = decode_putfh(&xdr)) != 0)
                goto out;
@@ -3964,6 +4598,9 @@ static int nfs4_xdr_dec_getattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_g
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -3980,12 +4617,13 @@ nfs4_xdr_enc_setacl(struct rpc_rqst *req, __be32 *p, struct nfs_setaclargs *args
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr = {
-               .nops   = 0,
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
        int status;
 
        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
-       encode_compound_hdr(&xdr, &hdr);
+       encode_compound_hdr(&xdr, req, &hdr);
+       encode_sequence(&xdr, &args->seq_args, &hdr);
        encode_putfh(&xdr, args->fh, &hdr);
        status = encode_setacl(&xdr, args, &hdr);
        encode_nops(&hdr);
@@ -3996,7 +4634,8 @@ nfs4_xdr_enc_setacl(struct rpc_rqst *req, __be32 *p, struct nfs_setaclargs *args
  * Decode SETACL response
  */
 static int
-nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p, void *res)
+nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p,
+                   struct nfs_setaclres *res)
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr;
@@ -4006,10 +4645,13 @@ nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, __be32 *p, void *res)
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
-       status = decode_setattr(&xdr, res);
+       status = decode_setattr(&xdr);
 out:
        return status;
 }
@@ -4029,6 +4671,9 @@ nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, __be32 *p,
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4051,6 +4696,9 @@ static int nfs4_xdr_dec_close(struct rpc_rqst *rqstp, __be32 *p, struct nfs_clos
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4081,6 +4729,9 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, __be32 *p, struct nfs_openr
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4135,6 +4786,9 @@ static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp, __be32 *p, struct nf
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4159,10 +4813,13 @@ static int nfs4_xdr_dec_setattr(struct rpc_rqst *rqstp, __be32 *p, struct nfs_se
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
-       status = decode_setattr(&xdr, res);
+       status = decode_setattr(&xdr);
        if (status)
                goto out;
        decode_getfattr(&xdr, res->fattr, res->server);
@@ -4183,6 +4840,9 @@ static int nfs4_xdr_dec_lock(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lock_
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4204,6 +4864,9 @@ static int nfs4_xdr_dec_lockt(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lock
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4225,6 +4888,9 @@ static int nfs4_xdr_dec_locku(struct rpc_rqst *rqstp, __be32 *p, struct nfs_lock
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4247,6 +4913,9 @@ static int nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp, __be32 *p,
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4268,6 +4937,9 @@ static int nfs4_xdr_dec_readdir(struct rpc_rqst *rqstp, __be32 *p, struct nfs4_r
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4289,6 +4961,9 @@ static int nfs4_xdr_dec_read(struct rpc_rqst *rqstp, __be32 *p, struct nfs_readr
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4312,6 +4987,9 @@ static int nfs4_xdr_dec_write(struct rpc_rqst *rqstp, __be32 *p, struct nfs_writ
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4338,6 +5016,9 @@ static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, __be32 *p, struct nfs_wri
        status = decode_compound_hdr(&xdr, &hdr);
        if (status)
                goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
+               goto out;
        status = decode_putfh(&xdr);
        if (status)
                goto out;
@@ -4362,6 +5043,8 @@ static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, __be32 *p,
        xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
        status = decode_compound_hdr(&xdr, &hdr);
        if (!status)
+               status = decode_sequence(&xdr, &res->seq_res, req);
+       if (!status)
                status = decode_putfh(&xdr);
        if (!status)
                status = decode_fsinfo(&xdr, res->fsinfo);
@@ -4381,6 +5064,8 @@ static int nfs4_xdr_dec_pathconf(struct rpc_rqst *req, __be32 *p,
        xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
        status = decode_compound_hdr(&xdr, &hdr);
        if (!status)
+               status = decode_sequence(&xdr, &res->seq_res, req);
+       if (!status)
                status = decode_putfh(&xdr);
        if (!status)
                status = decode_pathconf(&xdr, res->pathconf);
@@ -4400,6 +5085,8 @@ static int nfs4_xdr_dec_statfs(struct rpc_rqst *req, __be32 *p,
        xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
        status = decode_compound_hdr(&xdr, &hdr);
        if (!status)
+               status = decode_sequence(&xdr, &res->seq_res, req);
+       if (!status)
                status = decode_putfh(&xdr);
        if (!status)
                status = decode_statfs(&xdr, res->fsstat);
@@ -4416,7 +5103,11 @@ static int nfs4_xdr_dec_server_caps(struct rpc_rqst *req, __be32 *p, struct nfs4
        int status;
 
        xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
-       if ((status = decode_compound_hdr(&xdr, &hdr)) != 0)
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (status)
+               goto out;
+       status = decode_sequence(&xdr, &res->seq_res, req);
+       if (status)
                goto out;
        if ((status = decode_putfh(&xdr)) != 0)
                goto out;
@@ -4489,7 +5180,10 @@ static int nfs4_xdr_dec_delegreturn(struct rpc_rqst *rqstp, __be32 *p, struct nf
 
        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
        status = decode_compound_hdr(&xdr, &hdr);
-       if (status != 0)
+       if (status)
+               goto out;
+       status = decode_sequence(&xdr, &res->seq_res, rqstp);
+       if (status)
                goto out;
        status = decode_putfh(&xdr);
        if (status != 0)
@@ -4503,7 +5197,8 @@ out:
 /*
  * FS_LOCATIONS request
  */
-static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req, __be32 *p, struct nfs4_fs_locations *res)
+static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req, __be32 *p,
+                                    struct nfs4_fs_locations_res *res)
 {
        struct xdr_stream xdr;
        struct compound_hdr hdr;
@@ -4511,18 +5206,113 @@ static int nfs4_xdr_dec_fs_locations(struct rpc_rqst *req, __be32 *p, struct nfs
 
        xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
        status = decode_compound_hdr(&xdr, &hdr);
-       if (status != 0)
+       if (status)
+               goto out;
+       status = decode_sequence(&xdr, &res->seq_res, req);
+       if (status)
                goto out;
        if ((status = decode_putfh(&xdr)) != 0)
                goto out;
        if ((status = decode_lookup(&xdr)) != 0)
                goto out;
        xdr_enter_page(&xdr, PAGE_SIZE);
-       status = decode_getfattr(&xdr, &res->fattr, res->server);
+       status = decode_getfattr(&xdr, &res->fs_locations->fattr,
+                                res->fs_locations->server);
 out:
        return status;
 }
 
+#if defined(CONFIG_NFS_V4_1)
+/*
+ * EXCHANGE_ID request
+ */
+static int nfs4_xdr_dec_exchange_id(struct rpc_rqst *rqstp, uint32_t *p,
+                                   void *res)
+{
+       struct xdr_stream xdr;
+       struct compound_hdr hdr;
+       int status;
+
+       xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (!status)
+               status = decode_exchange_id(&xdr, res);
+       return status;
+}
+
+/*
+ * a CREATE_SESSION request
+ */
+static int nfs4_xdr_dec_create_session(struct rpc_rqst *rqstp, uint32_t *p,
+                                      struct nfs41_create_session_res *res)
+{
+       struct xdr_stream xdr;
+       struct compound_hdr hdr;
+       int status;
+
+       xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (!status)
+               status = decode_create_session(&xdr, res);
+       return status;
+}
+
+/*
+ * a DESTROY_SESSION request
+ */
+static int nfs4_xdr_dec_destroy_session(struct rpc_rqst *rqstp, uint32_t *p,
+                                       void *dummy)
+{
+       struct xdr_stream xdr;
+       struct compound_hdr hdr;
+       int status;
+
+       xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (!status)
+               status = decode_destroy_session(&xdr, dummy);
+       return status;
+}
+
+/*
+ * a SEQUENCE request
+ */
+static int nfs4_xdr_dec_sequence(struct rpc_rqst *rqstp, uint32_t *p,
+                                struct nfs4_sequence_res *res)
+{
+       struct xdr_stream xdr;
+       struct compound_hdr hdr;
+       int status;
+
+       xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (!status)
+               status = decode_sequence(&xdr, res, rqstp);
+       return status;
+}
+
+/*
+ * a GET_LEASE_TIME request
+ */
+static int nfs4_xdr_dec_get_lease_time(struct rpc_rqst *rqstp, uint32_t *p,
+                                      struct nfs4_get_lease_time_res *res)
+{
+       struct xdr_stream xdr;
+       struct compound_hdr hdr;
+       int status;
+
+       xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
+       status = decode_compound_hdr(&xdr, &hdr);
+       if (!status)
+               status = decode_sequence(&xdr, &res->lr_seq_res, rqstp);
+       if (!status)
+               status = decode_putrootfh(&xdr);
+       if (!status)
+               status = decode_fsinfo(&xdr, res->lr_fsinfo);
+       return status;
+}
+#endif /* CONFIG_NFS_V4_1 */
+
 __be32 *nfs4_decode_dirent(__be32 *p, struct nfs_entry *entry, int plus)
 {
        uint32_t bitmap[2] = {0};
@@ -4692,6 +5482,13 @@ struct rpc_procinfo      nfs4_procedures[] = {
   PROC(GETACL,         enc_getacl,     dec_getacl),
   PROC(SETACL,         enc_setacl,     dec_setacl),
   PROC(FS_LOCATIONS,   enc_fs_locations, dec_fs_locations),
+#if defined(CONFIG_NFS_V4_1)
+  PROC(EXCHANGE_ID,    enc_exchange_id,        dec_exchange_id),
+  PROC(CREATE_SESSION, enc_create_session,     dec_create_session),
+  PROC(DESTROY_SESSION,        enc_destroy_session,    dec_destroy_session),
+  PROC(SEQUENCE,       enc_sequence,   dec_sequence),
+  PROC(GET_LEASE_TIME, enc_get_lease_time,     dec_get_lease_time),
+#endif /* CONFIG_NFS_V4_1 */
 };
 
 struct rpc_version             nfs_version4 = {