diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 17:24:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-19 17:24:54 -0700 |
| commit | f72caf7e496465182eeda842ac66a5e75404ddf1 (patch) | |
| tree | 682e2e4b34d6240ea5dbc516d368dd14b21de182 /block/scsi_ioctl.c | |
| parent | 6a6be470c3071559970c5659354484d4f664050e (diff) | |
| parent | e4e83ea47babd9d4bf95a13aed87f8ef51e46472 (diff) | |
| download | blackbird-op-linux-f72caf7e496465182eeda842ac66a5e75404ddf1.tar.gz blackbird-op-linux-f72caf7e496465182eeda842ac66a5e75404ddf1.zip | |
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
...
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions
