Linus Torvalds 419f431949 Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux ... Pull the rest of the nfsd commits from Bruce Fields: "... and then I cherry-picked the remainder of the patches from the head of my previous branch" This is the rest of the original nfsd branch, rebased without the delegation stuff that I thought really needed to be redone. I don't like rebasing things like this in general, but in this situation this was the lesser of two evils. * 'for-3.5' of git://linux-nfs.org/~bfields/linux: (50 commits) nfsd4: fix, consolidate client_has_state nfsd4: don't remove rebooted client record until confirmation nfsd4: remove some dprintk's and a comment nfsd4: return "real" sequence id in confirmed case nfsd4: fix exchange_id to return confirm flag nfsd4: clarify that renewing expired client is a bug nfsd4: simpler ordering of setclientid_confirm checks nfsd4: setclientid: remove pointless assignment nfsd4: fix error return in non-matching-creds case nfsd4: fix setclientid_confirm same_cred check nfsd4: merge 3 setclientid cases to 2 nfsd4: pull out common code from setclientid cases nfsd4: merge last two setclientid cases nfsd4: setclientid/confirm comment cleanup nfsd4: setclientid remove unnecessary terms from a logical expression nfsd4: move rq_flavor into svc_cred nfsd4: stricter cred comparison for setclientid/exchange_id nfsd4: move principal name into svc_cred nfsd4: allow removing clients not holding state nfsd4: rearrange exchange_id logic to simplify ...		2012-06-01 08:32:58 -07:00
..
clnt4xdr.c	lockd: fix the endianness bug	2012-04-13 13:50:52 -04:00
clntlock.c	Lockd: pass network namespace to creation and destruction routines	2012-04-11 17:55:06 -04:00
clntproc.c
clntxdr.c	lockd: fix the endianness bug	2012-04-13 13:50:52 -04:00
grace.c
host.c	Lockd: shutdown NLM hosts in network namespace context	2012-02-15 00:19:48 -05:00
Makefile
mon.c	LockD: make NSM network namespace aware	2012-02-15 00:19:48 -05:00
netns.h	Lockd: pernet usage counter introduced	2012-02-15 00:19:47 -05:00
svc4proc.c
svc.c	LockD: add debug message to start and stop functions	2012-05-31 20:29:44 -04:00
svclock.c	SUNRPC/LOCKD: Fix build warnings when CONFIG_SUNRPC_DEBUG is undefined	2012-03-21 09:31:44 -04:00
svcproc.c
svcshare.c
svcsubs.c	vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb	2012-01-06 23:16:53 -05:00
xdr4.c
xdr.c