aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-30 08:56:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-30 08:56:39 -0700
commitb612a0553714c6b9744ad0d03f10cac78f3a84b1 (patch)
tree9dfb5cb5d13c187ff1f54448f8441512203625d0 /kernel
parent52b0ace7dfe8f70350218017a95d7cab1eb41fbb (diff)
parent2a8e5e3637e2fc058798f5d3626f525729ffaaaf (diff)
downloadmrst-s0i3-test-b612a0553714c6b9744ad0d03f10cac78f3a84b1.tar.gz
mrst-s0i3-test-b612a0553714c6b9744ad0d03f10cac78f3a84b1.tar.xz
mrst-s0i3-test-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 'kernel')
-rw-r--r--kernel/sched.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 15b93f617fd..d4840814250 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4054,6 +4054,23 @@ int __sched wait_for_completion_killable(struct completion *x)
EXPORT_SYMBOL(wait_for_completion_killable);
/**
+ * wait_for_completion_killable_timeout: - waits for completion of a task (w/(to,killable))
+ * @x: holds the state of this particular completion
+ * @timeout: timeout value in jiffies
+ *
+ * This waits for either a completion of a specific task to be
+ * signaled or for a specified timeout to expire. It can be
+ * interrupted by a kill signal. The timeout is in jiffies.
+ */
+unsigned long __sched
+wait_for_completion_killable_timeout(struct completion *x,
+ unsigned long timeout)
+{
+ return wait_for_common(x, timeout, TASK_KILLABLE);
+}
+EXPORT_SYMBOL(wait_for_completion_killable_timeout);
+
+/**
* try_wait_for_completion - try to decrement a completion without blocking
* @x: completion structure
*