Merge tag 'nfs-cel-for-3.19' of git://git.linux-nfs.org/projects/anna/nfs-rdma into linux-next

Pull pull additional NFS client changes for 3.19 from Anna Schumaker:
  "NFS: Generic client side changes from Chuck

  These patches fixes for iostats and SETCLIENTID in addition to cleaning
  up the nfs4_init_callback() function.

  Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>"

* tag 'nfs-cel-for-3.19' of git://git.linux-nfs.org/projects/anna/nfs-rdma:
  NFS: Clean up nfs4_init_callback()
  NFS: SETCLIENTID XDR buffer sizes are incorrect
  SUNRPC: serialize iostats updates

2 files changed, 20 insertions, 21 deletions

diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 5f07a0ed9188..03311259b0c4 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -241,28 +241,25 @@ void nfs4_free_client(struct nfs_client *clp)
  */
 static int nfs4_init_callback(struct nfs_client *clp)
 {
+        struct rpc_xprt *xprt;
         int error;
 
-        if (clp->rpc_ops->version == 4) {
-                struct rpc_xprt *xprt;
+        xprt = rcu_dereference_raw(clp->cl_rpcclient->cl_xprt);
 
-                xprt = rcu_dereference_raw(clp->cl_rpcclient->cl_xprt);
-
-                if (nfs4_has_session(clp)) {
-                        error = xprt_setup_backchannel(xprt,
-                                                NFS41_BC_MIN_CALLBACKS);
-                        if (error < 0)
-                                return error;
-                }
-
-                error = nfs_callback_up(clp->cl_mvops->minor_version, xprt);
-                if (error < 0) {
-                        dprintk("%s: failed to start callback. Error = %d\n",
-                                __func__, error);
+        if (nfs4_has_session(clp)) {
+                error = xprt_setup_backchannel(xprt, NFS41_BC_MIN_CALLBACKS);
+                if (error < 0)
                         return error;
-                }
-                __set_bit(NFS_CS_CALLBACK, &clp->cl_res_state);
         }
+
+        error = nfs_callback_up(clp->cl_mvops->minor_version, xprt);
+        if (error < 0) {
+                dprintk("%s: failed to start callback. Error = %d\n",
+                        __func__, error);
+                return error;
+        }
+        __set_bit(NFS_CS_CALLBACK, &clp->cl_res_state);
+
         return 0;
 }
 
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 03d0fa62a06e..cb4376b78ed9 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -141,13 +141,15 @@ static int nfs4_stat_to_errno(int);
                                 XDR_QUADLEN(NFS4_VERIFIER_SIZE) + \
                                 XDR_QUADLEN(NFS4_SETCLIENTID_NAMELEN) + \
                                 1 /* sc_prog */ + \
-                                XDR_QUADLEN(RPCBIND_MAXNETIDLEN) + \
-                                XDR_QUADLEN(RPCBIND_MAXUADDRLEN) + \
+                                1 + XDR_QUADLEN(RPCBIND_MAXNETIDLEN) + \
+                                1 + XDR_QUADLEN(RPCBIND_MAXUADDRLEN) + \
                                 1) /* sc_cb_ident */
 #define decode_setclientid_maxsz \
                                 (op_decode_hdr_maxsz + \
-                                2 + \
-                                1024) /* large value for CLID_INUSE */
+                                2 /* clientid */ + \
+                                XDR_QUADLEN(NFS4_VERIFIER_SIZE) + \
+                                1 + XDR_QUADLEN(RPCBIND_MAXNETIDLEN) + \
+                                1 + XDR_QUADLEN(RPCBIND_MAXUADDRLEN))
 #define encode_setclientid_confirm_maxsz \
                                 (op_encode_hdr_maxsz + \
                                 3 + (NFS4_VERIFIER_SIZE >> 2))