nfsd changes for 2.6.34

nfsd changes for 2.6.34

[J. Bruce Fields]

Please pull the following nfsd changes from the 'nfsd' branch at:

  git://linux-nfs.org/~bfields/linux.git for-2.6.34 nfsd

This is an unusually quiet cycle for the NFS server--bugfixes, some IPv6
progress, and one new export operation to improve sync performance.

One exception to the 'mostly quiet' statement was a regression in the
rpc code which hit a lot of people: enormous thanks to Neil for tracking
that down.

--b.

Aime Le Rouzic (1):
      NFSD: Support AF_INET6 in svc_addsock() function

Ben Myers (2):
      commit_metadata export operation replacing nfsd_sync_dir
      xfs_export_operations.commit_metadata

Christoph Hellwig (1):
      nfsd: use vfs_fsync for non-directories

Chuck Lever (5):
      SUNRPC: Use rpc_pton() in ip_map_parse()
      SUNRPC: Bury "#ifdef IPV6" in svc_create_xprt()
      SUNRPC: NFS kernel APIs shouldn't return ENOENT for "transport not found"
      NFSD: Create PF_INET6 listener in write_ports
      NFSD: NFSv4 callback client should use RPC_TASK_SOFTCONN

J. Bruce Fields (6):
      nfsd: 4.1 has an rfc number
      Revert "sunrpc: fix peername failed on closed listener"
      Revert "sunrpc: move the close processing after do recvfrom method"
      svcrpc: treat uid's as unsigned
      nfsd4: fix minor memory leak
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming

Jeff Layton (2):
      lockd: release reference to nsm_handle in nlm_host_rebooted
      lockd: don't clear sm_monitored on nsm_reboot_lookup

Neil Brown (2):
      sunrpc: remove unnecessary svc_xprt_put
      nfsd: ensure sockets are closed on error

Ricardo Labiaga (3):
      nfsd41: nfsd4_decode_compound() does not recognize all ops
      nfsd4: Use FIRST_NFS4_OP in nfsd4_decode_compound()
      nfsd41: Create the recovery entry for the NFSv4.1 client

Trond Myklebust (1):
      nfsd: Use vfs_fsync_range() in nfsd_commit

 Documentation/filesystems/nfs/nfs41-server.txt |    5 +-
 fs/lockd/host.c                                |    2 +-
 fs/lockd/mon.c                                 |   12 +--
 fs/lockd/svc.c                                 |    2 -
 fs/nfs/callback.c                              |    2 -
 fs/nfsd/nfs4callback.c                         |    5 +-
 fs/nfsd/nfs4recover.c                          |    4 +-
 fs/nfsd/nfs4state.c                            |    4 +-
 fs/nfsd/nfs4xdr.c                              |    2 +-
 fs/nfsd/nfsctl.c                               |   24 +++-
 fs/nfsd/vfs.c                                  |  153 +++++++++++------------
 fs/xfs/linux-2.6/xfs_export.c                  |   20 +++
 include/linux/exportfs.h                       |    5 +
 net/sunrpc/svc_xprt.c                          |   27 ++--
 net/sunrpc/svcauth_unix.c                      |   49 ++++----
 net/sunrpc/svcsock.c                           |    3 +-
 16 files changed, 174 insertions(+), 145 deletions(-)

Re: nfsd changes for 2.6.34

[J. Bruce Fields]

On Sat, Mar 06, 2010 at 12:52:12PM -0500, bfields wrote:
> Please pull the following nfsd changes from the 'nfsd' branch at:
> 
>   git://linux-nfs.org/~bfields/linux.git for-2.6.34 nfsd
> 
> This is an unusually quiet cycle for the NFS server--bugfixes, some IPv6
> progress, and one new export operation to improve sync performance.
> 
> One exception to the 'mostly quiet' statement was a regression in the
> rpc code which hit a lot of people: enormous thanks to Neil for tracking
> that down.

However, I forgot to Cc stable on all of those.  Stable people, could
you also take the following three commits?:

	f5822754ea006563e1bf0a1f43faaad49c0d8bb2 Revert "sunrpc: fix
	peername failed on closed listener"
	1b644b6e6f6160ae35ce4b52c2ca89ed3e356e18 Revert "sunrpc: move
	the close processing after do recvfrom method"
	301e99ce4a2f42a317129230fd42e6cd874c64b0 nfsd: ensure sockets
	are closed on error

Let me know if you need more information.

--b.

Re: [stable] nfsd changes for 2.6.34

[Greg KH]

On Wed, Mar 24, 2010 at 10:24:14AM -0400, J. Bruce Fields wrote:
> On Sat, Mar 06, 2010 at 12:52:12PM -0500, bfields wrote:
> > Please pull the following nfsd changes from the 'nfsd' branch at:
> > 
> >   git://linux-nfs.org/~bfields/linux.git for-2.6.34 nfsd
> > 
> > This is an unusually quiet cycle for the NFS server--bugfixes, some IPv6
> > progress, and one new export operation to improve sync performance.
> > 
> > One exception to the 'mostly quiet' statement was a regression in the
> > rpc code which hit a lot of people: enormous thanks to Neil for tracking
> > that down.
> 
> However, I forgot to Cc stable on all of those.  Stable people, could
> you also take the following three commits?:
> 
> 	f5822754ea006563e1bf0a1f43faaad49c0d8bb2 Revert "sunrpc: fix
> 	peername failed on closed listener"
> 	1b644b6e6f6160ae35ce4b52c2ca89ed3e356e18 Revert "sunrpc: move
> 	the close processing after do recvfrom method"
> 	301e99ce4a2f42a317129230fd42e6cd874c64b0 nfsd: ensure sockets
> 	are closed on error
> 
> Let me know if you need more information.

I've queued all of these up for the .33 -stable tree.  If any of them
need to go into .32 (maybe that last one?), please let me know.

thanks,

greg k-h

Re: [stable] nfsd changes for 2.6.34

[J. Bruce Fields]

On Mon, Mar 29, 2010 at 11:24:43AM -0700, Greg KH wrote:
> On Wed, Mar 24, 2010 at 10:24:14AM -0400, J. Bruce Fields wrote:
> > On Sat, Mar 06, 2010 at 12:52:12PM -0500, bfields wrote:
> > > Please pull the following nfsd changes from the 'nfsd' branch at:
> > > 
> > >   git://linux-nfs.org/~bfields/linux.git for-2.6.34 nfsd
> > > 
> > > This is an unusually quiet cycle for the NFS server--bugfixes, some IPv6
> > > progress, and one new export operation to improve sync performance.
> > > 
> > > One exception to the 'mostly quiet' statement was a regression in the
> > > rpc code which hit a lot of people: enormous thanks to Neil for tracking
> > > that down.
> > 
> > However, I forgot to Cc stable on all of those.  Stable people, could
> > you also take the following three commits?:
> > 
> > 	f5822754ea006563e1bf0a1f43faaad49c0d8bb2 Revert "sunrpc: fix
> > 	peername failed on closed listener"
> > 	1b644b6e6f6160ae35ce4b52c2ca89ed3e356e18 Revert "sunrpc: move
> > 	the close processing after do recvfrom method"
> > 	301e99ce4a2f42a317129230fd42e6cd874c64b0 nfsd: ensure sockets
> > 	are closed on error
> > 
> > Let me know if you need more information.
> 
> I've queued all of these up for the .33 -stable tree.  If any of them
> need to go into .32 (maybe that last one?), please let me know.

Thanks; .32 needs all three of those.

--b.

Re: [stable] nfsd changes for 2.6.34

[Greg KH]

On Tue, Mar 30, 2010 at 10:40:54AM -0400, J. Bruce Fields wrote:
> On Mon, Mar 29, 2010 at 11:24:43AM -0700, Greg KH wrote:
> > On Wed, Mar 24, 2010 at 10:24:14AM -0400, J. Bruce Fields wrote:
> > > On Sat, Mar 06, 2010 at 12:52:12PM -0500, bfields wrote:
> > > > Please pull the following nfsd changes from the 'nfsd' branch at:
> > > > 
> > > >   git://linux-nfs.org/~bfields/linux.git for-2.6.34 nfsd
> > > > 
> > > > This is an unusually quiet cycle for the NFS server--bugfixes, some IPv6
> > > > progress, and one new export operation to improve sync performance.
> > > > 
> > > > One exception to the 'mostly quiet' statement was a regression in the
> > > > rpc code which hit a lot of people: enormous thanks to Neil for tracking
> > > > that down.
> > > 
> > > However, I forgot to Cc stable on all of those.  Stable people, could
> > > you also take the following three commits?:
> > > 
> > > 	f5822754ea006563e1bf0a1f43faaad49c0d8bb2 Revert "sunrpc: fix
> > > 	peername failed on closed listener"
> > > 	1b644b6e6f6160ae35ce4b52c2ca89ed3e356e18 Revert "sunrpc: move
> > > 	the close processing after do recvfrom method"
> > > 	301e99ce4a2f42a317129230fd42e6cd874c64b0 nfsd: ensure sockets
> > > 	are closed on error
> > > 
> > > Let me know if you need more information.
> > 
> > I've queued all of these up for the .33 -stable tree.  If any of them
> > need to go into .32 (maybe that last one?), please let me know.
> 
> Thanks; .32 needs all three of those.

Ok, care to backport them and send them to stable@kernel.org?  They
don't all apply cleanly from what I can see.

thanks,

greg k-h

Re: [stable] nfsd changes for 2.6.34

[J. Bruce Fields]

On Tue, Mar 30, 2010 at 01:03:20PM -0700, Greg KH wrote:
> On Tue, Mar 30, 2010 at 10:40:54AM -0400, J. Bruce Fields wrote:
> > On Mon, Mar 29, 2010 at 11:24:43AM -0700, Greg KH wrote:
> > > On Wed, Mar 24, 2010 at 10:24:14AM -0400, J. Bruce Fields wrote:
> > > > On Sat, Mar 06, 2010 at 12:52:12PM -0500, bfields wrote:
> > > > > Please pull the following nfsd changes from the 'nfsd' branch at:
> > > > > 
> > > > >   git://linux-nfs.org/~bfields/linux.git for-2.6.34 nfsd
> > > > > 
> > > > > This is an unusually quiet cycle for the NFS server--bugfixes, some IPv6
> > > > > progress, and one new export operation to improve sync performance.
> > > > > 
> > > > > One exception to the 'mostly quiet' statement was a regression in the
> > > > > rpc code which hit a lot of people: enormous thanks to Neil for tracking
> > > > > that down.
> > > > 
> > > > However, I forgot to Cc stable on all of those.  Stable people, could
> > > > you also take the following three commits?:
> > > > 
> > > > 	f5822754ea006563e1bf0a1f43faaad49c0d8bb2 Revert "sunrpc: fix
> > > > 	peername failed on closed listener"
> > > > 	1b644b6e6f6160ae35ce4b52c2ca89ed3e356e18 Revert "sunrpc: move
> > > > 	the close processing after do recvfrom method"
> > > > 	301e99ce4a2f42a317129230fd42e6cd874c64b0 nfsd: ensure sockets
> > > > 	are closed on error
> > > > 
> > > > Let me know if you need more information.
> > > 
> > > I've queued all of these up for the .33 -stable tree.  If any of them
> > > need to go into .32 (maybe that last one?), please let me know.
> > 
> > Thanks; .32 needs all three of those.
> 
> Ok, care to backport them and send them to stable@kernel.org?  They
> don't all apply cleanly from what I can see.

Huh.  I just checked out 2.6.32.10 and tried applying the patches a
couple different ways, and the worst I got was stuff like:

	patching file net/sunrpc/svc_xprt.c
	Hunk #1 succeeded at 711 (offset 5 lines).

Is that enough that you don't consider them clean?

In any case, I'll follow up with patches generated against 2.6.32.10.

--b.

[PATCH] nfsd4: don't try to map gid's in generic rpc code

[J. Bruce Fields]

From: J. Bruce Fields <bfields@citi.umich.edu>

For nfsd we provide users the option of mapping uid's to server-side
supplementary group lists.  That makes sense for nfsd, but not
necessarily for other rpc users (such as the callback client).

So move that lookup to svcauth_unix_set_client, which is a
program-specific method.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---
 net/sunrpc/svcauth_unix.c |   53 +++++++++++++++++++++++++-------------------
 1 files changed, 30 insertions(+), 23 deletions(-)

On Wed, Mar 31, 2010 at 03:30:29PM -0400, J. Bruce Fields wrote:
> In any case, I'll follow up with patches generated against 2.6.32.10.

Also, while testing those patches on 2.6.32, I noticed that 2.6.32.y
doesn't include the following (unrelated) patch.  Could you apply it as
well?  Thanks!

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 117f68a..97cc3de 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -655,23 +655,25 @@ static struct unix_gid *unix_gid_lookup(uid_t uid)
 		return NULL;
 }
 
-static int unix_gid_find(uid_t uid, struct group_info **gip,
-			 struct svc_rqst *rqstp)
+static struct group_info *unix_gid_find(uid_t uid, struct svc_rqst *rqstp)
 {
-	struct unix_gid *ug = unix_gid_lookup(uid);
+	struct unix_gid *ug;
+	struct group_info *gi;
+	int ret;
+
+	ug = unix_gid_lookup(uid);
 	if (!ug)
-		return -EAGAIN;
-	switch (cache_check(&unix_gid_cache, &ug->h, &rqstp->rq_chandle)) {
+		return ERR_PTR(-EAGAIN);
+	ret = cache_check(&unix_gid_cache, &ug->h, &rqstp->rq_chandle);
+	switch (ret) {
 	case -ENOENT:
-		*gip = NULL;
-		return 0;
+		return ERR_PTR(-ENOENT);
 	case 0:
-		*gip = ug->gi;
-		get_group_info(*gip);
+		gi = get_group_info(ug->gi);
 		cache_put(&ug->h, &unix_gid_cache);
-		return 0;
+		return gi;
 	default:
-		return -EAGAIN;
+		return ERR_PTR(-EAGAIN);
 	}
 }
 
@@ -681,6 +683,8 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
 	struct sockaddr_in *sin;
 	struct sockaddr_in6 *sin6, sin6_storage;
 	struct ip_map *ipm;
+	struct group_info *gi;
+	struct svc_cred *cred = &rqstp->rq_cred;
 
 	switch (rqstp->rq_addr.ss_family) {
 	case AF_INET:
@@ -722,6 +726,17 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
 			ip_map_cached_put(rqstp, ipm);
 			break;
 	}
+
+	gi = unix_gid_find(cred->cr_uid, rqstp);
+	switch (PTR_ERR(gi)) {
+	case -EAGAIN:
+		return SVC_DROP;
+	case -ENOENT:
+		break;
+	default:
+		put_group_info(cred->cr_group_info);
+		cred->cr_group_info = gi;
+	}
 	return SVC_OK;
 }
 
@@ -818,19 +833,11 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp)
 	slen = svc_getnl(argv);			/* gids length */
 	if (slen > 16 || (len -= (slen + 2)*4) < 0)
 		goto badcred;
-	if (unix_gid_find(cred->cr_uid, &cred->cr_group_info, rqstp)
-	    == -EAGAIN)
+	cred->cr_group_info = groups_alloc(slen);
+	if (cred->cr_group_info == NULL)
 		return SVC_DROP;
-	if (cred->cr_group_info == NULL) {
-		cred->cr_group_info = groups_alloc(slen);
-		if (cred->cr_group_info == NULL)
-			return SVC_DROP;
-		for (i = 0; i < slen; i++)
-			GROUP_AT(cred->cr_group_info, i) = svc_getnl(argv);
-	} else {
-		for (i = 0; i < slen ; i++)
-			svc_getnl(argv);
-	}
+	for (i = 0; i < slen; i++)
+		GROUP_AT(cred->cr_group_info, i) = svc_getnl(argv);
 	if (svc_getu32(argv) != htonl(RPC_AUTH_NULL) || svc_getu32(argv) != 0) {
 		*authp = rpc_autherr_badverf;
 		return SVC_DENIED;
-- 
1.6.3.3

Re: [stable] nfsd changes for 2.6.34

[Greg KH]

On Wed, Mar 31, 2010 at 03:30:29PM -0400, J. Bruce Fields wrote:
> On Tue, Mar 30, 2010 at 01:03:20PM -0700, Greg KH wrote:
> > On Tue, Mar 30, 2010 at 10:40:54AM -0400, J. Bruce Fields wrote:
> > > On Mon, Mar 29, 2010 at 11:24:43AM -0700, Greg KH wrote:
> > > > On Wed, Mar 24, 2010 at 10:24:14AM -0400, J. Bruce Fields wrote:
> > > > > On Sat, Mar 06, 2010 at 12:52:12PM -0500, bfields wrote:
> > > > > > Please pull the following nfsd changes from the 'nfsd' branch at:
> > > > > > 
> > > > > >   git://linux-nfs.org/~bfields/linux.git for-2.6.34 nfsd
> > > > > > 
> > > > > > This is an unusually quiet cycle for the NFS server--bugfixes, some IPv6
> > > > > > progress, and one new export operation to improve sync performance.
> > > > > > 
> > > > > > One exception to the 'mostly quiet' statement was a regression in the
> > > > > > rpc code which hit a lot of people: enormous thanks to Neil for tracking
> > > > > > that down.
> > > > > 
> > > > > However, I forgot to Cc stable on all of those.  Stable people, could
> > > > > you also take the following three commits?:
> > > > > 
> > > > > 	f5822754ea006563e1bf0a1f43faaad49c0d8bb2 Revert "sunrpc: fix
> > > > > 	peername failed on closed listener"
> > > > > 	1b644b6e6f6160ae35ce4b52c2ca89ed3e356e18 Revert "sunrpc: move
> > > > > 	the close processing after do recvfrom method"
> > > > > 	301e99ce4a2f42a317129230fd42e6cd874c64b0 nfsd: ensure sockets
> > > > > 	are closed on error
> > > > > 
> > > > > Let me know if you need more information.
> > > > 
> > > > I've queued all of these up for the .33 -stable tree.  If any of them
> > > > need to go into .32 (maybe that last one?), please let me know.
> > > 
> > > Thanks; .32 needs all three of those.
> > 
> > Ok, care to backport them and send them to stable@kernel.org?  They
> > don't all apply cleanly from what I can see.
> 
> Huh.  I just checked out 2.6.32.10 and tried applying the patches a
> couple different ways, and the worst I got was stuff like:
> 
> 	patching file net/sunrpc/svc_xprt.c
> 	Hunk #1 succeeded at 711 (offset 5 lines).
> 
> Is that enough that you don't consider them clean?
> 
> In any case, I'll follow up with patches generated against 2.6.32.10.

You are right, I don't know what I did wrong, sorry.  I've now queued
all of these up for the next .32 tree, as they are already in
.33-stable.

thanks,

greg k-h

Re: [stable] nfsd changes for 2.6.34

[J. Bruce Fields]

On Wed, Apr 21, 2010 at 03:50:48PM -0700, Greg KH wrote:
> On Wed, Mar 31, 2010 at 03:30:29PM -0400, J. Bruce Fields wrote:
> > On Tue, Mar 30, 2010 at 01:03:20PM -0700, Greg KH wrote:
> > > Ok, care to backport them and send them to stable@kernel.org?  They
> > > don't all apply cleanly from what I can see.
> > 
> > Huh.  I just checked out 2.6.32.10 and tried applying the patches a
> > couple different ways, and the worst I got was stuff like:
> > 
> > 	patching file net/sunrpc/svc_xprt.c
> > 	Hunk #1 succeeded at 711 (offset 5 lines).
> > 
> > Is that enough that you don't consider them clean?
> > 
> > In any case, I'll follow up with patches generated against 2.6.32.10.
> 
> You are right, I don't know what I did wrong, sorry.  I've now queued
> all of these up for the next .32 tree, as they are already in
> .33-stable.

OK, thanks.--b.