Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux: (62 commits) nfsd4: fix callback restarting nfsd: break lease on unlink, link, and rename nfsd4: break lease on nfsd setattr nfsd: don't support msnfs export option nfsd4: initialize cb_per_client nfsd4: allow restarting callbacks nfsd4: simplify nfsd4_cb_prepare nfsd4: give out delegations more quickly in 4.1 case nfsd4: add helper function to run callbacks nfsd4: make sure sequence flags are set after destroy_session nfsd4: re-probe callback on connection loss nfsd4: set sequence flag when backchannel is down nfsd4: keep finer-grained callback status rpc: allow xprt_class->setup to return a preexisting xprt rpc: keep backchannel xprt as long as server connection rpc: move sk_bc_xprt to svc_xprt nfsd4: allow backchannel recovery nfsd4: support BIND_CONN_TO_SESSION nfsd4: modify session list under cl_lock Documentation: fl_mylease no longer exists ... Fix up conflicts in fs/nfsd/vfs.c with the vfs-scale work. The vfs-scale work touched some msnfs cases, and this merge removes support for that entirely, so the conflict was trivial to resolve.
Showing
- Documentation/filesystems/Locking 0 additions, 2 deletionsDocumentation/filesystems/Locking
- fs/locks.c 1 addition, 7 deletionsfs/locks.c
- fs/nfsd/acl.h 0 additions, 2 deletionsfs/nfsd/acl.h
- fs/nfsd/export.c 0 additions, 4 deletionsfs/nfsd/export.c
- fs/nfsd/idmap.h 2 additions, 4 deletionsfs/nfsd/idmap.h
- fs/nfsd/nfs3proc.c 4 additions, 4 deletionsfs/nfsd/nfs3proc.c
- fs/nfsd/nfs4acl.c 1 addition, 1 deletionfs/nfsd/nfs4acl.c
- fs/nfsd/nfs4callback.c 99 additions, 52 deletionsfs/nfsd/nfs4callback.c
- fs/nfsd/nfs4idmap.c 8 additions, 7 deletionsfs/nfsd/nfs4idmap.c
- fs/nfsd/nfs4proc.c 47 additions, 12 deletionsfs/nfsd/nfs4proc.c
- fs/nfsd/nfs4recover.c 0 additions, 1 deletionfs/nfsd/nfs4recover.c
- fs/nfsd/nfs4state.c 145 additions, 98 deletionsfs/nfsd/nfs4state.c
- fs/nfsd/nfs4xdr.c 86 additions, 29 deletionsfs/nfsd/nfs4xdr.c
- fs/nfsd/nfsctl.c 3 additions, 1 deletionfs/nfsd/nfsctl.c
- fs/nfsd/nfsd.h 1 addition, 0 deletionsfs/nfsd/nfsd.h
- fs/nfsd/nfsproc.c 3 additions, 3 deletionsfs/nfsd/nfsproc.c
- fs/nfsd/nfssvc.c 1 addition, 1 deletionfs/nfsd/nfssvc.c
- fs/nfsd/state.h 15 additions, 1 deletionfs/nfsd/state.h
- fs/nfsd/vfs.c 30 additions, 55 deletionsfs/nfsd/vfs.c
- fs/nfsd/xdr4.h 8 additions, 1 deletionfs/nfsd/xdr4.h
Loading
Please register or sign in to comment