Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.35' of git://linux-nfs.org/~bfields/linux: (45 commits) Revert "nfsd4: distinguish expired from stale stateids" nfsd: safer initialization order in find_file() nfs4: minor callback code simplification, comment NFSD: don't report compiled-out versions as present nfsd4: implement reclaim_complete nfsd4: nfsd4_destroy_session must set callback client under the state lock nfsd4: keep a reference count on client while in use nfsd4: mark_client_expired nfsd4: introduce nfs4_client.cl_refcount nfsd4: refactor expire_client nfsd4: extend the client_lock to cover cl_lru nfsd4: use list_move in move_to_confirmed nfsd4: fold release_session into expire_client nfsd4: rename sessionid_lock to client_lock nfsd4: fix bare destroy_session null dereference nfsd4: use local variable in nfs4svc_encode_compoundres nfsd: further comment typos sunrpc: centralise most calls to svc_xprt_received nfsd4: fix unlikely race in session replay case nfsd4: fix filehandle comment ...
Showing
- Documentation/filesystems/nfs/nfs41-server.txt 1 addition, 1 deletionDocumentation/filesystems/nfs/nfs41-server.txt
- fs/nfsd/export.c 25 additions, 19 deletionsfs/nfsd/export.c
- fs/nfsd/nfs4callback.c 92 additions, 48 deletionsfs/nfsd/nfs4callback.c
- fs/nfsd/nfs4proc.c 36 additions, 14 deletionsfs/nfsd/nfs4proc.c
- fs/nfsd/nfs4state.c 196 additions, 180 deletionsfs/nfsd/nfs4state.c
- fs/nfsd/nfs4xdr.c 20 additions, 7 deletionsfs/nfsd/nfs4xdr.c
- fs/nfsd/nfsctl.c 47 additions, 17 deletionsfs/nfsd/nfsctl.c
- fs/nfsd/nfsd.h 3 additions, 3 deletionsfs/nfsd/nfsd.h
- fs/nfsd/nfssvc.c 1 addition, 1 deletionfs/nfsd/nfssvc.c
- fs/nfsd/state.h 38 additions, 9 deletionsfs/nfsd/state.h
- fs/nfsd/vfs.c 5 additions, 3 deletionsfs/nfsd/vfs.c
- fs/nfsd/vfs.h 1 addition, 0 deletionsfs/nfsd/vfs.h
- fs/nfsd/xdr4.h 8 additions, 3 deletionsfs/nfsd/xdr4.h
- include/linux/nfsd/nfsfh.h 3 additions, 3 deletionsinclude/linux/nfsd/nfsfh.h
- net/sunrpc/cache.c 29 additions, 16 deletionsnet/sunrpc/cache.c
- net/sunrpc/svc_xprt.c 4 additions, 2 deletionsnet/sunrpc/svc_xprt.c
- net/sunrpc/svcsock.c 1 addition, 14 deletionsnet/sunrpc/svcsock.c
- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 0 additions, 3 deletionsnet/sunrpc/xprtrdma/svc_rdma_recvfrom.c
Loading
Please register or sign in to comment