author | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 22 Sep 2009 14:54:33 +0000 (07:54 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 22 Sep 2009 14:54:33 +0000 (07:54 -0700) |
* 'for-2.6.32' of git://linux-nfs.org/~bfields/linux: (68 commits)
nfsd4: nfsv4 clients should cross mountpoints
nfsd: revise 4.1 status documentation
sunrpc/cache: avoid variable over-loading in cache_defer_req
sunrpc/cache: use list_del_init for the list_head entries in cache_deferred_req
nfsd: return success for non-NFS4 nfs4_state_start
nfsd41: Refactor create_client()
nfsd41: modify nfsd4.1 backchannel to use new xprt class
nfsd41: Backchannel: Implement cb_recall over NFSv4.1
nfsd41: Backchannel: cb_sequence callback
nfsd41: Backchannel: Setup sequence information
nfsd41: Backchannel: Server backchannel RPC wait queue
nfsd41: Backchannel: Add sequence arguments to callback RPC arguments
nfsd41: Backchannel: callback infrastructure
nfsd4: use common rpc_cred for all callbacks
nfsd4: allow nfs4 state startup to fail
SUNRPC: Defer the auth_gss upcall when the RPC call is asynchronous
nfsd4: fix null dereference creating nfsv4 callback client
nfsd4: fix whitespace in NFSPROC4_CLNT_CB_NULL definition
nfsd41: sunrpc: add new xprt class for nfsv4.1 backchannel
sunrpc/cache: simplify cache_fresh_locked and cache_fresh_unlocked.
...
nfsd4: nfsv4 clients should cross mountpoints
nfsd: revise 4.1 status documentation
sunrpc/cache: avoid variable over-loading in cache_defer_req
sunrpc/cache: use list_del_init for the list_head entries in cache_deferred_req
nfsd: return success for non-NFS4 nfs4_state_start
nfsd41: Refactor create_client()
nfsd41: modify nfsd4.1 backchannel to use new xprt class
nfsd41: Backchannel: Implement cb_recall over NFSv4.1
nfsd41: Backchannel: cb_sequence callback
nfsd41: Backchannel: Setup sequence information
nfsd41: Backchannel: Server backchannel RPC wait queue
nfsd41: Backchannel: Add sequence arguments to callback RPC arguments
nfsd41: Backchannel: callback infrastructure
nfsd4: use common rpc_cred for all callbacks
nfsd4: allow nfs4 state startup to fail
SUNRPC: Defer the auth_gss upcall when the RPC call is asynchronous
nfsd4: fix null dereference creating nfsv4 callback client
nfsd4: fix whitespace in NFSPROC4_CLNT_CB_NULL definition
nfsd41: sunrpc: add new xprt class for nfsv4.1 backchannel
sunrpc/cache: simplify cache_fresh_locked and cache_fresh_unlocked.
...
1 | 2 | |||
---|---|---|---|---|
fs/nfsd/nfs4state.c | patch | | diff1 | | diff2 | | blob | history |
fs/nfsd/nfssvc.c | patch | | diff1 | | diff2 | | blob | history |
fs/nfsd/vfs.c | patch | | diff1 | | diff2 | | blob | history |
include/linux/lockd/lockd.h | patch | | diff1 | | diff2 | | blob | history |
include/linux/nfs4.h | patch | | diff1 | | diff2 | | blob | history |
net/sunrpc/clnt.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc fs/nfsd/nfs4state.c
Simple merge
diff --cc fs/nfsd/nfssvc.c
Simple merge
diff --cc fs/nfsd/vfs.c
Simple merge
diff --cc include/linux/lockd/lockd.h
Simple merge
diff --cc include/linux/nfs4.h
Simple merge
diff --cc net/sunrpc/clnt.c
Simple merge