]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 624bd5b c2ef47b)
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)
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

1  2 
fs/nfs/nfs4client.c patch | diff1 | diff2 | blob | history
fs/nfs/nfs4xdr.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/nfs4client.c
Simple merge
diff --cc fs/nfs/nfs4xdr.c
Simple merge
XArray, radix tree and IDR