Skip to contentSkip to conversation

nfsd changes for 4.7

GIT PULL J. Bruce Fields 1 participant 1 message May 24, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Please pull nfsd changes from the nfsd-4.7 branch at:

git://linux-nfs.org/~bfields/linux.git tags/nfsd-4.7

----------------------------------------------------------------
A very quiet cycle for nfsd, mainly just an RDMA update from Chuck Lever.

----------------------------------------------------------------
Chuck Lever (7):
svcrdma: Do not add XDR padding to xdr_buf page vector
svcrdma: svc_rdma_put_context() is invoked twice in Send error path
svcrdma: Remove superfluous line from rdma_read_chunks()
svcrdma: Post Receives only for forward channel requests
svcrdma: Drain QP before freeing svcrdma_xprt
svcrdma: Eliminate code duplication in svc_rdma_recvfrom()
svcrdma: Generalize svc_rdma_xdr_decode_req()

J. Bruce Fields (2):
Remove unnecessary allocation
svcrpc: autoload rdma module

Jeff Layton (1):
nfsd: handle seqid wraparound in nfsd4_preprocess_layout_stateid

Shirley Ma (1):
svcrdma: Support IPv6 with NFS/RDMA

Tomáš Trnka (1):
sunrpc: fix stripping of padded MIC tokens

 fs/nfsd/nfs3xdr.c                        |  2 +-
 fs/nfsd/nfs4layouts.c                    |  2 +-
 fs/nfsd/nfs4state.c                      |  8 +-------
 fs/nfsd/state.h                          |  5 +++++
 include/linux/sunrpc/svc_rdma.h          |  2 +-
 net/sunrpc/auth_gss/svcauth_gss.c        |  9 ++++-----
 net/sunrpc/svc_xprt.c                    | 23 +++++++++++++++++----
 net/sunrpc/xprtrdma/svc_rdma_marshal.c   | 32 ++++++++++++++++++++----------
 net/sunrpc/xprtrdma/svc_rdma_recvfrom.c  | 34 ++++++++------------------------
 net/sunrpc/xprtrdma/svc_rdma_sendto.c    | 28 ++++++++++++--------------
 net/sunrpc/xprtrdma/svc_rdma_transport.c | 17 ++++++++++++++--
 11 files changed, 90 insertions(+), 72 deletions(-)