You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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 ...		13 years ago
..
Makefile	lockd: Introduce new-style XDR functions for NLMv4	14 years ago
clnt4xdr.c	lockd: fix the endianness bug	13 years ago
clntlock.c	Lockd: pass network namespace to creation and destruction routines	13 years ago
clntproc.c	lockd: properly convert be32 values in debug messages	14 years ago
clntxdr.c	lockd: fix the endianness bug	13 years ago
grace.c	nfsd: common grace period control	17 years ago
host.c	Lockd: shutdown NLM hosts in network namespace context	13 years ago
mon.c	LockD: make NSM network namespace aware	13 years ago
netns.h	Lockd: pernet usage counter introduced	13 years ago
svc.c	LockD: add debug message to start and stop functions	13 years ago
svc4proc.c	lockd: Clean up nlmsvc_lookup_host()	14 years ago
svclock.c	SUNRPC/LOCKD: Fix build warnings when CONFIG_SUNRPC_DEBUG is undefined	13 years ago
svcproc.c	lockd: Clean up nlmsvc_lookup_host()	14 years ago
svcshare.c	lockd: fix sparse warning in svcshare.c	17 years ago
svcsubs.c	vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb	13 years ago
xdr.c	lockd: Move nlmdbg_cookie2a() to svclock.c	14 years ago
xdr4.c	lockd: Introduce new-style XDR functions for NLMv4	14 years ago