Merge tag 'staging-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[cascardo/linux.git] / fs / nfs / nfs42xdr.c

diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c
index 0ca482a..6dc6f2a 100644 (file)
--- a/fs/nfs/nfs42xdr.c
+++ b/fs/nfs/nfs42xdr.c
@@ -9,9 +9,22 @@
 #define encode_fallocate_maxsz         (encode_stateid_maxsz + \
                                         2 /* offset */ + \
                                         2 /* length */)
+#define NFS42_WRITE_RES_SIZE           (1 /* wr_callback_id size */ +\
+                                        XDR_QUADLEN(NFS4_STATEID_SIZE) + \
+                                        2 /* wr_count */ + \
+                                        1 /* wr_committed */ + \
+                                        XDR_QUADLEN(NFS4_VERIFIER_SIZE))
 #define encode_allocate_maxsz          (op_encode_hdr_maxsz + \
                                         encode_fallocate_maxsz)
 #define decode_allocate_maxsz          (op_decode_hdr_maxsz)
+#define encode_copy_maxsz              (op_encode_hdr_maxsz +          \
+                                        XDR_QUADLEN(NFS4_STATEID_SIZE) + \
+                                        XDR_QUADLEN(NFS4_STATEID_SIZE) + \
+                                        2 + 2 + 2 + 1 + 1 + 1)
+#define decode_copy_maxsz              (op_decode_hdr_maxsz + \
+                                        NFS42_WRITE_RES_SIZE + \
+                                        1 /* cr_consecutive */ + \
+                                        1 /* cr_synchronous */)
 #define encode_deallocate_maxsz                (op_encode_hdr_maxsz + \
                                         encode_fallocate_maxsz)
 #define decode_deallocate_maxsz                (op_decode_hdr_maxsz)
@@ -49,6 +62,16 @@
                                         decode_putfh_maxsz + \
                                         decode_allocate_maxsz + \
                                         decode_getattr_maxsz)
+#define NFS4_enc_copy_sz               (compound_encode_hdr_maxsz + \
+                                        encode_putfh_maxsz + \
+                                        encode_savefh_maxsz + \
+                                        encode_putfh_maxsz + \
+                                        encode_copy_maxsz)
+#define NFS4_dec_copy_sz               (compound_decode_hdr_maxsz + \
+                                        decode_putfh_maxsz + \
+                                        decode_savefh_maxsz + \
+                                        decode_putfh_maxsz + \
+                                        decode_copy_maxsz)
 #define NFS4_enc_deallocate_sz         (compound_encode_hdr_maxsz + \
                                         encode_putfh_maxsz + \
                                         encode_deallocate_maxsz + \
@@ -102,6 +125,23 @@ static void encode_allocate(struct xdr_stream *xdr,
        encode_fallocate(xdr, args);
 }
 
+static void encode_copy(struct xdr_stream *xdr,
+                       struct nfs42_copy_args *args,
+                       struct compound_hdr *hdr)
+{
+       encode_op_hdr(xdr, OP_COPY, decode_copy_maxsz, hdr);
+       encode_nfs4_stateid(xdr, &args->src_stateid);
+       encode_nfs4_stateid(xdr, &args->dst_stateid);
+
+       encode_uint64(xdr, args->src_pos);
+       encode_uint64(xdr, args->dst_pos);
+       encode_uint64(xdr, args->count);
+
+       encode_uint32(xdr, 1); /* consecutive = true */
+       encode_uint32(xdr, 1); /* synchronous = true */
+       encode_uint32(xdr, 0); /* src server list */
+}
+
 static void encode_deallocate(struct xdr_stream *xdr,
                              struct nfs42_falloc_args *args,
                              struct compound_hdr *hdr)
@@ -181,6 +221,26 @@ static void nfs4_xdr_enc_allocate(struct rpc_rqst *req,
        encode_nops(&hdr);
 }
 
+/*
+ * Encode COPY request
+ */
+static void nfs4_xdr_enc_copy(struct rpc_rqst *req,
+                             struct xdr_stream *xdr,
+                             struct nfs42_copy_args *args)
+{
+       struct compound_hdr hdr = {
+               .minorversion = nfs4_xdr_minorversion(&args->seq_args),
+       };
+
+       encode_compound_hdr(xdr, req, &hdr);
+       encode_sequence(xdr, &args->seq_args, &hdr);
+       encode_putfh(xdr, args->src_fh, &hdr);
+       encode_savefh(xdr, &hdr);
+       encode_putfh(xdr, args->dst_fh, &hdr);
+       encode_copy(xdr, args, &hdr);
+       encode_nops(&hdr);
+}
+
 /*
  * Encode DEALLOCATE request
  */
@@ -266,6 +326,62 @@ static int decode_allocate(struct xdr_stream *xdr, struct nfs42_falloc_res *res)
        return decode_op_hdr(xdr, OP_ALLOCATE);
 }
 
+static int decode_write_response(struct xdr_stream *xdr,
+                                struct nfs42_write_res *res)
+{
+       __be32 *p;
+       int stateids;
+
+       p = xdr_inline_decode(xdr, 4 + 8 + 4);
+       if (unlikely(!p))
+               goto out_overflow;
+
+       stateids = be32_to_cpup(p++);
+       p = xdr_decode_hyper(p, &res->count);
+       res->verifier.committed = be32_to_cpup(p);
+       return decode_verifier(xdr, &res->verifier.verifier);
+
+out_overflow:
+       print_overflow_msg(__func__, xdr);
+       return -EIO;
+}
+
+static int decode_copy_requirements(struct xdr_stream *xdr,
+                                   struct nfs42_copy_res *res) {
+       __be32 *p;
+
+       p = xdr_inline_decode(xdr, 4 + 4);
+       if (unlikely(!p))
+               goto out_overflow;
+
+       res->consecutive = be32_to_cpup(p++);
+       res->synchronous = be32_to_cpup(p++);
+       return 0;
+out_overflow:
+       print_overflow_msg(__func__, xdr);
+       return -EIO;
+}
+
+static int decode_copy(struct xdr_stream *xdr, struct nfs42_copy_res *res)
+{
+       int status;
+
+       status = decode_op_hdr(xdr, OP_COPY);
+       if (status == NFS4ERR_OFFLOAD_NO_REQS) {
+               status = decode_copy_requirements(xdr, res);
+               if (status)
+                       return status;
+               return NFS4ERR_OFFLOAD_NO_REQS;
+       } else if (status)
+               return status;
+
+       status = decode_write_response(xdr, &res->write_res);
+       if (status)
+               return status;
+
+       return decode_copy_requirements(xdr, res);
+}
+
 static int decode_deallocate(struct xdr_stream *xdr, struct nfs42_falloc_res *res)
 {
        return decode_op_hdr(xdr, OP_DEALLOCATE);
@@ -330,6 +446,36 @@ out:
        return status;
 }
 
+/*
+ * Decode COPY response
+ */
+static int nfs4_xdr_dec_copy(struct rpc_rqst *rqstp,
+                            struct xdr_stream *xdr,
+                            struct nfs42_copy_res *res)
+{
+       struct compound_hdr hdr;
+       int status;
+
+       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_savefh(xdr);
+       if (status)
+               goto out;
+       status = decode_putfh(xdr);
+       if (status)
+               goto out;
+       status = decode_copy(xdr, res);
+out:
+       return status;
+}
+
 /*
  * Decode DEALLOCATE request
  */