2016-03-24 13:35:53

by J. Bruce Fields

[permalink] [raw]
Subject: [GIT PULL] nfsd changes for 4.6

Please pull nfsd changes for 4.6 from

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

----------------------------------------------------------------
Various bugfixes, a RDMA update from Chuck Lever, and support for a new
pnfs layout type from Christoph Hellwig. The new layout type is a
variant of the block layout which uses SCSI features to offer improved
fencing and device identification.

(Also: note this pull request also includes the client side of SCSI
layout, with Trond's permission.)

----------------------------------------------------------------
Chuck Lever (14):
nfsd: Update NFS server comments related to RDMA support
svcrdma: Find client-provided write and reply chunks once per reply
svcrdma: Do not write xdr_buf::tail in a Write chunk
svcrdma: Do not send Write chunk XDR pad with inline content
nfsd: Lower NFSv4.1 callback message size limit
svcrdma: Close connection when a send error occurs
svcrdma: svc_rdma_post_recv() should close connection on error
rpcrdma: Add RPCRDMA_HDRLEN_ERR
svcrdma: Make RDMA_ERROR messages work
svcrdma: Use correct XID in error replies
svcrdma: Hook up the logic to return ERR_CHUNK
svcrdma: Remove close_out exit path
svcrdma: Use new CQ API for RPC-over-RDMA server receive CQs
svcrdma: Use new CQ API for RPC-over-RDMA server send CQs

J. Bruce Fields (3):
nfsd4: fix bad bounds checking
nfsd4: resfh unused in nfsd4_secinfo
nfsd: fix deadlock secinfo+readdir compound

Kinglong Mee (1):
nfsd: Fix a memory leak when meeting unsupported state_protect_how4

NeilBrown (1):
sunrpc/cache: drop reference when sunrpc_cache_pipe_upcall() detects a race

Sudip Mukherjee (1):
nfsd: recover: fix memory leak

fs/nfsd/nfs4proc.c | 3 +-
fs/nfsd/nfs4recover.c | 1 +
fs/nfsd/nfs4state.c | 29 +-
fs/nfsd/nfs4xdr.c | 15 +-
include/linux/sunrpc/auth.h | 7 +
include/linux/sunrpc/rpc_rdma.h | 1 +
include/linux/sunrpc/svc_rdma.h | 20 +-
net/sunrpc/auth_null.c | 4 +-
net/sunrpc/auth_unix.c | 6 +-
net/sunrpc/cache.c | 6 +-
net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 17 +-
net/sunrpc/xprtrdma/svc_rdma_marshal.c | 64 +++--
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 60 ++--
net/sunrpc/xprtrdma/svc_rdma_sendto.c | 196 +++++++++----
net/sunrpc/xprtrdma/svc_rdma_transport.c | 445 ++++++++++-------------------
15 files changed, 408 insertions(+), 466 deletions(-)


2016-03-24 19:00:56

by Trond Myklebust

[permalink] [raw]
Subject: Re: [GIT PULL] nfsd changes for 4.6

On Thu, Mar 24, 2016 at 9:35 AM, J. Bruce Fields <[email protected]> wrote:
> Please pull nfsd changes for 4.6 from
>
> git://linux-nfs.org/~bfields/linux.git tags/nfsd-4.6
>
> ----------------------------------------------------------------
> Various bugfixes, a RDMA update from Chuck Lever, and support for a new
> pnfs layout type from Christoph Hellwig. The new layout type is a
> variant of the block layout which uses SCSI features to offer improved
> fencing and device identification.
>
> (Also: note this pull request also includes the client side of SCSI
> layout, with Trond's permission.)

Umm.... Did you forget to include those patches, Bruce?

2016-03-24 19:11:00

by J. Bruce Fields

[permalink] [raw]
Subject: Re: [GIT PULL] nfsd changes for 4.6

On Thu, Mar 24, 2016 at 03:00:55PM -0400, Trond Myklebust wrote:
> On Thu, Mar 24, 2016 at 9:35 AM, J. Bruce Fields <[email protected]> wrote:
> > Please pull nfsd changes for 4.6 from
> >
> > git://linux-nfs.org/~bfields/linux.git tags/nfsd-4.6
> >
> > ----------------------------------------------------------------
> > Various bugfixes, a RDMA update from Chuck Lever, and support for a new
> > pnfs layout type from Christoph Hellwig. The new layout type is a
> > variant of the block layout which uses SCSI features to offer improved
> > fencing and device identification.
> >
> > (Also: note this pull request also includes the client side of SCSI
> > layout, with Trond's permission.)
>
> Umm.... Did you forget to include those patches, Bruce?

Oh no, I forgot to update a branch before running my usual script so,
yes, that tag's a subset of what I meant to send.

Uh, I guess what I'll do is push an nfsd-4.6-1 tag with the rest. Linus
can either pull both tags or just the new one and hopefully the result's
OK either way. Just a couple minutes....

--b.