Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux: (67 commits) nfsd: get rid of NFSD_VERSION nfsd: last_byte_offset nfsd: delete wrong file comment from nfsd/nfs4xdr.c nfsd: git rid of nfs4_cb_null_ops declaration nfsd: dprint each op status in nfsd4_proc_compound nfsd: add etoosmall to nfserrno NFSD: FIDs need to take precedence over UUIDs SUNRPC: The sunrpc server code should not be used by out-of-tree modules svc: Clean up deferred requests on transport destruction nfsd: fix double-locks of directory mutex svc: Move kfree of deferral record to common code CRED: Fix NFSD regression NLM: Clean up flow of control in make_socks() function NLM: Refactor make_socks() function nfsd: Ensure nfsv4 calls the underlying filesystem on LOCKT SUNRPC: Ensure the server closes sockets in a timely fashion NFSD: Add documenting comments for nfsctl interface NFSD: Replace open-coded integer with macro NFSD: Fix a handful of coding style issues in write_filehandle() NFSD: clean up failover sysctl function naming ...
No related branches found
No related tags found
Showing
- fs/lockd/clntproc.c 2 additions, 5 deletionsfs/lockd/clntproc.c
- fs/lockd/host.c 17 additions, 153 deletionsfs/lockd/host.c
- fs/lockd/mon.c 424 additions, 145 deletionsfs/lockd/mon.c
- fs/lockd/svc.c 48 additions, 24 deletionsfs/lockd/svc.c
- fs/lockd/svc4proc.c 1 addition, 12 deletionsfs/lockd/svc4proc.c
- fs/lockd/svcproc.c 1 addition, 12 deletionsfs/lockd/svcproc.c
- fs/lockd/svcsubs.c 0 additions, 1 deletionfs/lockd/svcsubs.c
- fs/lockd/xdr.c 2 additions, 3 deletionsfs/lockd/xdr.c
- fs/lockd/xdr4.c 2 additions, 3 deletionsfs/lockd/xdr4.c
- fs/nfsd/auth.c 2 additions, 2 deletionsfs/nfsd/auth.c
- fs/nfsd/nfs4callback.c 0 additions, 3 deletionsfs/nfsd/nfs4callback.c
- fs/nfsd/nfs4proc.c 5 additions, 0 deletionsfs/nfsd/nfs4proc.c
- fs/nfsd/nfs4recover.c 1 addition, 1 deletionfs/nfsd/nfs4recover.c
- fs/nfsd/nfs4state.c 50 additions, 29 deletionsfs/nfsd/nfs4state.c
- fs/nfsd/nfs4xdr.c 0 additions, 2 deletionsfs/nfsd/nfs4xdr.c
- fs/nfsd/nfsctl.c 451 additions, 28 deletionsfs/nfsd/nfsctl.c
- fs/nfsd/nfsfh.c 27 additions, 9 deletionsfs/nfsd/nfsfh.c
- fs/nfsd/nfsproc.c 1 addition, 0 deletionsfs/nfsd/nfsproc.c
- fs/nfsd/vfs.c 31 additions, 3 deletionsfs/nfsd/vfs.c
- include/linux/lockd/lockd.h 43 additions, 25 deletionsinclude/linux/lockd/lockd.h
Loading
Please register or sign in to comment