Merge tag 'nfs-cel-for-3.19' of git://git.linux-nfs.org/projects/anna/nfs-rdma into...
authorTrond Myklebust <trond.myklebust@primarydata.com>
Wed, 26 Nov 2014 22:27:43 +0000 (17:27 -0500)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Wed, 26 Nov 2014 22:34:14 +0000 (17:34 -0500)
commit1702562db4bf6d43f60c2263ac7bec1f58d49c33
treeb971f0d7a20451ed3560389c15971019376445c7
parent624bd5b7b683c978c6d5f4e9f6142cfb3470983d
parentc2ef47b7f518f5eae5ffed11b8ac754fb263d398
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
fs/nfs/nfs4client.c
fs/nfs/nfs4xdr.c