Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux: (34 commits) nfsd4: fix file open accounting for RDWR opens nfsd: don't allow setting maxblksize after svc created nfsd: initialize nfsd versions before creating svc net: sunrpc: removed duplicated #include nfsd41: Fix a crash when a callback is retried nfsd: fix startup/shutdown order bug nfsd: minor nfsd read api cleanup gcc-4.6: nfsd: fix initialized but not read warnings nfsd4: share file descriptors between stateid's nfsd4: fix openmode checking on IO using lock stateid nfsd4: miscellaneous process_open2 cleanup nfsd4: don't pretend to support write delegations nfsd: bypass readahead cache when have struct file nfsd: minor nfsd_svc() cleanup nfsd: move more into nfsd_startup() nfsd: just keep single lockd reference for nfsd nfsd: clean up nfsd_create_serv error handling nfsd: fix error handling in __write_ports_addxprt nfsd: fix error handling when starting nfsd with rpcbind down nfsd4: fix v4 state shutdown error paths ...
No related branches found
No related tags found
Showing
- fs/nfsd/nfs3proc.c 5 additions, 3 deletionsfs/nfsd/nfs3proc.c
- fs/nfsd/nfs4callback.c 32 additions, 25 deletionsfs/nfsd/nfs4callback.c
- fs/nfsd/nfs4state.c 235 additions, 146 deletionsfs/nfsd/nfs4state.c
- fs/nfsd/nfs4xdr.c 2 additions, 1 deletionfs/nfsd/nfs4xdr.c
- fs/nfsd/nfsctl.c 11 additions, 13 deletionsfs/nfsd/nfsctl.c
- fs/nfsd/nfsd.h 1 addition, 0 deletionsfs/nfsd/nfsd.h
- fs/nfsd/nfsproc.c 1 addition, 3 deletionsfs/nfsd/nfsproc.c
- fs/nfsd/nfssvc.c 95 additions, 56 deletionsfs/nfsd/nfssvc.c
- fs/nfsd/state.h 38 additions, 2 deletionsfs/nfsd/state.h
- fs/nfsd/vfs.c 42 additions, 37 deletionsfs/nfsd/vfs.c
- fs/nfsd/vfs.h 3 additions, 1 deletionfs/nfsd/vfs.h
- include/linux/sunrpc/cache.h 1 addition, 0 deletionsinclude/linux/sunrpc/cache.h
- net/sunrpc/cache.c 6 additions, 2 deletionsnet/sunrpc/cache.c
- net/sunrpc/sunrpc_syms.c 1 addition, 0 deletionsnet/sunrpc/sunrpc_syms.c
Loading
Please register or sign in to comment