Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
Pull nfsd changes from J. Bruce Fields: "This has been an unusually quiet cycle--mostly bugfixes and cleanup. The one large piece is Stanislav's work to containerize the server's grace period--but that in itself is just one more step in a not-yet-complete project to allow fully containerized nfs service. There are a number of outstanding delegation, container, v4 state, and gss patches that aren't quite ready yet; 3.7 may be wilder." * 'nfsd-next' of git://linux-nfs.org/~bfields/linux: (35 commits) NFSd: make boot_time variable per network namespace NFSd: make grace end flag per network namespace Lockd: move grace period management from lockd() to per-net functions LockD: pass actual network namespace to grace period management functions LockD: manage grace list per network namespace SUNRPC: service request network namespace helper introduced NFSd: make nfsd4_manager allocated per network namespace context. LockD: make lockd manager allocated per network namespace LockD: manage grace period per network namespace Lockd: add more debug to host shutdown functions Lockd: host complaining function introduced LockD: manage used host count per networks namespace LockD: manage garbage collection timeout per networks namespace LockD: make garbage collector network namespace aware. LockD: mark host per network namespace on garbage collect nfsd4: fix missing fault_inject.h include locks: move lease-specific code out of locks_delete_lock locks: prevent side-effects of locks_release_private before file_lock is initialized NFSd: set nfsd_serv to NULL after service destruction NFSd: introduce nfsd_destroy() helper ...
No related branches found
No related tags found
Showing
- fs/lockd/grace.c 11 additions, 5 deletionsfs/lockd/grace.c
- fs/lockd/host.c 62 additions, 30 deletionsfs/lockd/host.c
- fs/lockd/netns.h 7 additions, 0 deletionsfs/lockd/netns.h
- fs/lockd/svc.c 25 additions, 18 deletionsfs/lockd/svc.c
- fs/lockd/svc4proc.c 7 additions, 6 deletionsfs/lockd/svc4proc.c
- fs/lockd/svclock.c 8 additions, 8 deletionsfs/lockd/svclock.c
- fs/lockd/svcproc.c 9 additions, 6 deletionsfs/lockd/svcproc.c
- fs/lockd/svcsubs.c 13 additions, 6 deletionsfs/lockd/svcsubs.c
- fs/locks.c 11 additions, 17 deletionsfs/locks.c
- fs/nfs/callback_xdr.c 2 additions, 2 deletionsfs/nfs/callback_xdr.c
- fs/nfsd/export.c 5 additions, 5 deletionsfs/nfsd/export.c
- fs/nfsd/netns.h 4 additions, 0 deletionsfs/nfsd/netns.h
- fs/nfsd/nfs4callback.c 0 additions, 1 deletionfs/nfsd/nfs4callback.c
- fs/nfsd/nfs4idmap.c 2 additions, 2 deletionsfs/nfsd/nfs4idmap.c
- fs/nfsd/nfs4proc.c 10 additions, 8 deletionsfs/nfsd/nfs4proc.c
- fs/nfsd/nfs4state.c 118 additions, 83 deletionsfs/nfsd/nfs4state.c
- fs/nfsd/nfs4xdr.c 1 addition, 1 deletionfs/nfsd/nfs4xdr.c
- fs/nfsd/nfsctl.c 2 additions, 6 deletionsfs/nfsd/nfsctl.c
- fs/nfsd/nfsd.h 13 additions, 0 deletionsfs/nfsd/nfsd.h
- fs/nfsd/nfssvc.c 8 additions, 16 deletionsfs/nfsd/nfssvc.c
Loading
Please register or sign in to comment