diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 08:56:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 08:56:39 -0700 |
| commit | b612a0553714c6b9744ad0d03f10cac78f3a84b1 (patch) | |
| tree | 9dfb5cb5d13c187ff1f54448f8441512203625d0 /include | |
| parent | 52b0ace7dfe8f70350218017a95d7cab1eb41fbb (diff) | |
| parent | 2a8e5e3637e2fc058798f5d3626f525729ffaaaf (diff) | |
| download | kernel-common-b612a0553714c6b9744ad0d03f10cac78f3a84b1.tar.gz kernel-common-b612a0553714c6b9744ad0d03f10cac78f3a84b1.tar.bz2 kernel-common-b612a0553714c6b9744ad0d03f10cac78f3a84b1.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/completion.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/completion.h b/include/linux/completion.h index 4a6b604ef7e4..51e3145196f6 100644 --- a/include/linux/completion.h +++ b/include/linux/completion.h @@ -83,6 +83,8 @@ extern unsigned long wait_for_completion_timeout(struct completion *x, unsigned long timeout); extern unsigned long wait_for_completion_interruptible_timeout( struct completion *x, unsigned long timeout); +extern unsigned long wait_for_completion_killable_timeout( + struct completion *x, unsigned long timeout); extern bool try_wait_for_completion(struct completion *x); extern bool completion_done(struct completion *x); |