Merge origin/master into drm-misc-fixes

[karo-tx-linux.git] / fs / nfs / nfs42xdr.c

diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c
index 528362f69cc1ba6156102b113fdd5ba18c566c71..5ee1b0f0d904490bb0a08478101ae49cd09acb57 100644 (file)
--- a/fs/nfs/nfs42xdr.c
+++ b/fs/nfs/nfs42xdr.c
@@ -112,7 +112,7 @@
                                         decode_getattr_maxsz)
 
 static void encode_fallocate(struct xdr_stream *xdr,
-                            struct nfs42_falloc_args *args)
+                            const struct nfs42_falloc_args *args)
 {
        encode_nfs4_stateid(xdr, &args->falloc_stateid);
        encode_uint64(xdr, args->falloc_offset);
@@ -120,7 +120,7 @@ static void encode_fallocate(struct xdr_stream *xdr,
 }
 
 static void encode_allocate(struct xdr_stream *xdr,
-                           struct nfs42_falloc_args *args,
+                           const struct nfs42_falloc_args *args,
                            struct compound_hdr *hdr)
 {
        encode_op_hdr(xdr, OP_ALLOCATE, decode_allocate_maxsz, hdr);
@@ -128,7 +128,7 @@ static void encode_allocate(struct xdr_stream *xdr,
 }
 
 static void encode_copy(struct xdr_stream *xdr,
-                       struct nfs42_copy_args *args,
+                       const struct nfs42_copy_args *args,
                        struct compound_hdr *hdr)
 {
        encode_op_hdr(xdr, OP_COPY, decode_copy_maxsz, hdr);
@@ -145,7 +145,7 @@ static void encode_copy(struct xdr_stream *xdr,
 }
 
 static void encode_deallocate(struct xdr_stream *xdr,
-                             struct nfs42_falloc_args *args,
+                             const struct nfs42_falloc_args *args,
                              struct compound_hdr *hdr)
 {
        encode_op_hdr(xdr, OP_DEALLOCATE, decode_deallocate_maxsz, hdr);
@@ -153,7 +153,7 @@ static void encode_deallocate(struct xdr_stream *xdr,
 }
 
 static void encode_seek(struct xdr_stream *xdr,
-                       struct nfs42_seek_args *args,
+                       const struct nfs42_seek_args *args,
                        struct compound_hdr *hdr)
 {
        encode_op_hdr(xdr, OP_SEEK, decode_seek_maxsz, hdr);
@@ -163,7 +163,7 @@ static void encode_seek(struct xdr_stream *xdr,
 }
 
 static void encode_layoutstats(struct xdr_stream *xdr,
-                              struct nfs42_layoutstat_args *args,
+                              const struct nfs42_layoutstat_args *args,
                               struct nfs42_layoutstat_devinfo *devinfo,
                               struct compound_hdr *hdr)
 {
@@ -191,7 +191,7 @@ static void encode_layoutstats(struct xdr_stream *xdr,
 }
 
 static void encode_clone(struct xdr_stream *xdr,
-                        struct nfs42_clone_args *args,
+                        const struct nfs42_clone_args *args,
                         struct compound_hdr *hdr)
 {
        __be32 *p;
@@ -210,8 +210,9 @@ static void encode_clone(struct xdr_stream *xdr,
  */
 static void nfs4_xdr_enc_allocate(struct rpc_rqst *req,
                                  struct xdr_stream *xdr,
-                                 struct nfs42_falloc_args *args)
+                                 const void *data)
 {
+       const struct nfs42_falloc_args *args = data;
        struct compound_hdr hdr = {
                .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
@@ -225,7 +226,7 @@ static void nfs4_xdr_enc_allocate(struct rpc_rqst *req,
 }
 
 static void encode_copy_commit(struct xdr_stream *xdr,
-                         struct nfs42_copy_args *args,
+                         const struct nfs42_copy_args *args,
                          struct compound_hdr *hdr)
 {
        __be32 *p;
@@ -241,8 +242,9 @@ static void encode_copy_commit(struct xdr_stream *xdr,
  */
 static void nfs4_xdr_enc_copy(struct rpc_rqst *req,
                              struct xdr_stream *xdr,
-                             struct nfs42_copy_args *args)
+                             const void *data)
 {
+       const struct nfs42_copy_args *args = data;
        struct compound_hdr hdr = {
                .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
@@ -262,8 +264,9 @@ static void nfs4_xdr_enc_copy(struct rpc_rqst *req,
  */
 static void nfs4_xdr_enc_deallocate(struct rpc_rqst *req,
                                    struct xdr_stream *xdr,
-                                   struct nfs42_falloc_args *args)
+                                   const void *data)
 {
+       const struct nfs42_falloc_args *args = data;
        struct compound_hdr hdr = {
                .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
@@ -281,8 +284,9 @@ static void nfs4_xdr_enc_deallocate(struct rpc_rqst *req,
  */
 static void nfs4_xdr_enc_seek(struct rpc_rqst *req,
                              struct xdr_stream *xdr,
-                             struct nfs42_seek_args *args)
+                             const void *data)
 {
+       const struct nfs42_seek_args *args = data;
        struct compound_hdr hdr = {
                .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
@@ -299,8 +303,9 @@ static void nfs4_xdr_enc_seek(struct rpc_rqst *req,
  */
 static void nfs4_xdr_enc_layoutstats(struct rpc_rqst *req,
                                     struct xdr_stream *xdr,
-                                    struct nfs42_layoutstat_args *args)
+                                    const void *data)
 {
+       const struct nfs42_layoutstat_args *args = data;
        int i;
 
        struct compound_hdr hdr = {
@@ -321,8 +326,9 @@ static void nfs4_xdr_enc_layoutstats(struct rpc_rqst *req,
  */
 static void nfs4_xdr_enc_clone(struct rpc_rqst *req,
                               struct xdr_stream *xdr,
-                              struct nfs42_clone_args *args)
+                              const void *data)
 {
+       const struct nfs42_clone_args *args = data;
        struct compound_hdr hdr = {
                .minorversion = nfs4_xdr_minorversion(&args->seq_args),
        };
@@ -448,8 +454,9 @@ static int decode_clone(struct xdr_stream *xdr)
  */
 static int nfs4_xdr_dec_allocate(struct rpc_rqst *rqstp,
                                 struct xdr_stream *xdr,
-                                struct nfs42_falloc_res *res)
+                                void *data)
 {
+       struct nfs42_falloc_res *res = data;
        struct compound_hdr hdr;
        int status;
 
@@ -475,8 +482,9 @@ out:
  */
 static int nfs4_xdr_dec_copy(struct rpc_rqst *rqstp,
                             struct xdr_stream *xdr,
-                            struct nfs42_copy_res *res)
+                            void *data)
 {
+       struct nfs42_copy_res *res = data;
        struct compound_hdr hdr;
        int status;
 
@@ -508,8 +516,9 @@ out:
  */
 static int nfs4_xdr_dec_deallocate(struct rpc_rqst *rqstp,
                                   struct xdr_stream *xdr,
-                                  struct nfs42_falloc_res *res)
+                                  void *data)
 {
+       struct nfs42_falloc_res *res = data;
        struct compound_hdr hdr;
        int status;
 
@@ -535,8 +544,9 @@ out:
  */
 static int nfs4_xdr_dec_seek(struct rpc_rqst *rqstp,
                             struct xdr_stream *xdr,
-                            struct nfs42_seek_res *res)
+                            void *data)
 {
+       struct nfs42_seek_res *res = data;
        struct compound_hdr hdr;
        int status;
 
@@ -559,8 +569,9 @@ out:
  */
 static int nfs4_xdr_dec_layoutstats(struct rpc_rqst *rqstp,
                                    struct xdr_stream *xdr,
-                                   struct nfs42_layoutstat_res *res)
+                                   void *data)
 {
+       struct nfs42_layoutstat_res *res = data;
        struct compound_hdr hdr;
        int status, i;
 
@@ -589,8 +600,9 @@ out:
  */
 static int nfs4_xdr_dec_clone(struct rpc_rqst *rqstp,
                              struct xdr_stream *xdr,
-                             struct nfs42_clone_res *res)
+                             void *data)
 {
+       struct nfs42_clone_res *res = data;
        struct compound_hdr hdr;
        int status;