Merge branch 'for-2.6.32' of git://linux-nfs.org/~bfields/linux
* '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. ...
No related branches found
No related tags found
Showing
- Documentation/filesystems/nfs41-server.txt 54 additions, 0 deletionsDocumentation/filesystems/nfs41-server.txt
- fs/lockd/clntlock.c 1 addition, 1 deletionfs/lockd/clntlock.c
- fs/lockd/host.c 2 additions, 2 deletionsfs/lockd/host.c
- fs/lockd/mon.c 1 addition, 1 deletionfs/lockd/mon.c
- fs/lockd/svcsubs.c 1 addition, 1 deletionfs/lockd/svcsubs.c
- fs/nfsd/export.c 2 additions, 0 deletionsfs/nfsd/export.c
- fs/nfsd/nfs3xdr.c 36 additions, 39 deletionsfs/nfsd/nfs3xdr.c
- fs/nfsd/nfs4acl.c 2 additions, 2 deletionsfs/nfsd/nfs4acl.c
- fs/nfsd/nfs4callback.c 221 additions, 42 deletionsfs/nfsd/nfs4callback.c
- fs/nfsd/nfs4proc.c 45 additions, 44 deletionsfs/nfsd/nfs4proc.c
- fs/nfsd/nfs4state.c 317 additions, 364 deletionsfs/nfsd/nfs4state.c
- fs/nfsd/nfs4xdr.c 18 additions, 24 deletionsfs/nfsd/nfs4xdr.c
- fs/nfsd/nfsctl.c 3 additions, 5 deletionsfs/nfsd/nfsctl.c
- fs/nfsd/nfsfh.c 86 additions, 72 deletionsfs/nfsd/nfsfh.c
- fs/nfsd/nfssvc.c 40 additions, 14 deletionsfs/nfsd/nfssvc.c
- fs/nfsd/vfs.c 8 additions, 1 deletionfs/nfsd/vfs.c
- include/linux/lockd/lockd.h 0 additions, 43 deletionsinclude/linux/lockd/lockd.h
- include/linux/nfs4.h 1 addition, 1 deletioninclude/linux/nfs4.h
- include/linux/nfsd/nfsd.h 5 additions, 2 deletionsinclude/linux/nfsd/nfsd.h
- include/linux/nfsd/state.h 54 additions, 23 deletionsinclude/linux/nfsd/state.h
Loading
Please register or sign in to comment