Merge tag 'nfs-for-4.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client updates from Trond Myklebust:
 "Highlights include:

  New features:
   - RDMA client backchannel from Chuck
   - Support for NFSv4.2 file CLONE using the btrfs ioctl

  Bugfixes + cleanups:
   - Move socket data receive out of the bottom halves and into a
     workqueue
   - Refactor NFSv4 error handling so synchronous and asynchronous RPC
     handles errors identically.
   - Fix a panic when blocks or object layouts reads return a bad data
     length
   - Fix nfsroot so it can handle a 1024 byte long path.
   - Fix bad usage of page offset in bl_read_pagelist
   - Various NFSv4 callback cleanups+fixes
   - Fix GETATTR bitmap verification
   - Support hexadecimal number for sunrpc debug sysctl files"

* tag 'nfs-for-4.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (53 commits)
  Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug
  nfs: Fix GETATTR bitmap verification
  nfs: Remove unused xdr page offsets in getacl/setacl arguments
  fs/nfs: remove unnecessary new_valid_dev check
  SUNRPC: fix variable type
  NFS: Enable client side NFSv4.1 backchannel to use other transports
  pNFS/flexfiles: Add support for FF_FLAGS_NO_IO_THRU_MDS
  pNFS/flexfiles: When mirrored, retry failed reads by switching mirrors
  SUNRPC: Remove the TCP-only restriction in bc_svc_process()
  svcrdma: Add backward direction service for RPC/RDMA transport
  xprtrdma: Handle incoming backward direction RPC calls
  xprtrdma: Add support for sending backward direction RPC replies
  xprtrdma: Pre-allocate Work Requests for backchannel
  xprtrdma: Pre-allocate backward rpc_rqst and send/receive buffers
  SUNRPC: Abstract backchannel operations
  xprtrdma: Saving IRQs no longer needed for rb_lock
  xprtrdma: Remove reply tasklet
  xprtrdma: Use workqueue to process RPC/RDMA replies
  xprtrdma: Replace send and receive arrays
  xprtrdma: Refactor reply handler error handling
  ...

1 files changed, 96 insertions, 1 deletions

diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c
index 0eb29e14070d..0ca482a51e53 100644
--- a/fs/nfs/nfs42xdr.c
+++ b/fs/nfs/nfs42xdr.c
@@ -34,6 +34,12 @@
                                         1 /* opaque devaddr4 length */ + \
                                         XDR_QUADLEN(PNFS_LAYOUTSTATS_MAXSIZE))
 #define decode_layoutstats_maxsz        (op_decode_hdr_maxsz)
+#define encode_clone_maxsz              (encode_stateid_maxsz + \
+                                        encode_stateid_maxsz + \
+                                        2 /* src offset */ + \
+                                        2 /* dst offset */ + \
+                                        2 /* count */)
+#define decode_clone_maxsz              (op_decode_hdr_maxsz)
 
 #define NFS4_enc_allocate_sz            (compound_encode_hdr_maxsz + \
                                          encode_putfh_maxsz + \
@@ -65,7 +71,20 @@
                                          decode_sequence_maxsz + \
                                          decode_putfh_maxsz + \
                                          PNFS_LAYOUTSTATS_MAXDEV * decode_layoutstats_maxsz)
-
+#define NFS4_enc_clone_sz               (compound_encode_hdr_maxsz + \
+                                         encode_sequence_maxsz + \
+                                         encode_putfh_maxsz + \
+                                         encode_savefh_maxsz + \
+                                         encode_putfh_maxsz + \
+                                         encode_clone_maxsz + \
+                                         encode_getattr_maxsz)
+#define NFS4_dec_clone_sz               (compound_decode_hdr_maxsz + \
+                                         decode_sequence_maxsz + \
+                                         decode_putfh_maxsz + \
+                                         decode_savefh_maxsz + \
+                                         decode_putfh_maxsz + \
+                                         decode_clone_maxsz + \
+                                         decode_getattr_maxsz)
 
 static void encode_fallocate(struct xdr_stream *xdr,
                              struct nfs42_falloc_args *args)
@@ -128,6 +147,21 @@ static void encode_layoutstats(struct xdr_stream *xdr,
                 encode_uint32(xdr, 0);
 }
 
+static void encode_clone(struct xdr_stream *xdr,
+                         struct nfs42_clone_args *args,
+                         struct compound_hdr *hdr)
+{
+        __be32 *p;
+
+        encode_op_hdr(xdr, OP_CLONE, decode_clone_maxsz, hdr);
+        encode_nfs4_stateid(xdr, &args->src_stateid);
+        encode_nfs4_stateid(xdr, &args->dst_stateid);
+        p = reserve_space(xdr, 3*8);
+        p = xdr_encode_hyper(p, args->src_offset);
+        p = xdr_encode_hyper(p, args->dst_offset);
+        xdr_encode_hyper(p, args->count);
+}
+
 /*
  * Encode ALLOCATE request
  */
@@ -206,6 +240,27 @@ static void nfs4_xdr_enc_layoutstats(struct rpc_rqst *req,
         encode_nops(&hdr);
 }
 
+/*
+ * Encode CLONE request
+ */
+static void nfs4_xdr_enc_clone(struct rpc_rqst *req,
+                               struct xdr_stream *xdr,
+                               struct nfs42_clone_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_clone(xdr, args, &hdr);
+        encode_getfattr(xdr, args->dst_bitmask, &hdr);
+        encode_nops(&hdr);
+}
+
 static int decode_allocate(struct xdr_stream *xdr, struct nfs42_falloc_res *res)
 {
         return decode_op_hdr(xdr, OP_ALLOCATE);
@@ -243,6 +298,11 @@ static int decode_layoutstats(struct xdr_stream *xdr)
         return decode_op_hdr(xdr, OP_LAYOUTSTATS);
 }
 
+static int decode_clone(struct xdr_stream *xdr)
+{
+        return decode_op_hdr(xdr, OP_CLONE);
+}
+
 /*
  * Decode ALLOCATE request
  */
@@ -351,4 +411,39 @@ out:
         return status;
 }
 
+/*
+ * Decode CLONE request
+ */
+static int nfs4_xdr_dec_clone(struct rpc_rqst *rqstp,
+                              struct xdr_stream *xdr,
+                              struct nfs42_clone_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_clone(xdr);
+        if (status)
+                goto out;
+        status = decode_getfattr(xdr, res->dst_fattr, res->server);
+
+out:
+        res->rpc_status = status;
+        return status;
+}
+
 #endif /* __LINUX_FS_NFS_NFS4_2XDR_H */