author | Linus Torvalds <torvalds@linux-foundation.org> | |
Sun, 30 May 2010 15:56:39 +0000 (08:56 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Sun, 30 May 2010 15:56:39 +0000 (08:56 -0700) | ||
commit | b612a0553714c6b9744ad0d03f10cac78f3a84b1 | |
tree | 9dfb5cb5d13c187ff1f54448f8441512203625d0 | tree | snapshot (tar.xz tar.gz zip) |
parent | 52b0ace7dfe8f70350218017a95d7cab1eb41fbb | commit | diff |
parent | 2a8e5e3637e2fc058798f5d3626f525729ffaaaf | commit | diff |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: clean up on forwarded aborted mds request
ceph: fix leak of osd authorizer
ceph: close out mds, osd connections before stopping auth
ceph: make lease code DN specific
fs/ceph: Use ERR_CAST
ceph: renew auth tickets before they expire
ceph: do not resend mon requests on auth ticket renewal
ceph: removed duplicated #includes
ceph: avoid possible null dereference
ceph: make mds requests killable, not interruptible
sched: add wait_for_completion_killable_timeout
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: clean up on forwarded aborted mds request
ceph: fix leak of osd authorizer
ceph: close out mds, osd connections before stopping auth
ceph: make lease code DN specific
fs/ceph: Use ERR_CAST
ceph: renew auth tickets before they expire
ceph: do not resend mon requests on auth ticket renewal
ceph: removed duplicated #includes
ceph: avoid possible null dereference
ceph: make mds requests killable, not interruptible
sched: add wait_for_completion_killable_timeout
fs/ceph/dir.c | diff1 | | diff2 | | blob | history |
fs/ceph/file.c | diff1 | | diff2 | | blob | history |
fs/ceph/super.c | diff1 | | diff2 | | blob | history |
fs/ceph/super.h | diff1 | | diff2 | | blob | history |
kernel/sched.c | diff1 | | diff2 | | blob | history |