From c93539c304e95e26a31ac9e40aaa7004f2b64a84 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <matthew@wil.cx>
Date: Fri, 14 Mar 2008 13:19:33 -0400
Subject: [PATCH] --- yaml --- r: 88564 b: refs/heads/master c:
 f06d96865861c3dd01520f47e2e61c899db1631f h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/semaphore.h |  6 ++++++
 trunk/kernel/semaphore.c        | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e7ea286cc161..78a5055edd28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64ac24e738823161693bf791f87adc802cf529ff
+refs/heads/master: f06d96865861c3dd01520f47e2e61c899db1631f
diff --git a/trunk/include/linux/semaphore.h b/trunk/include/linux/semaphore.h
index b3c691b089b2..88f2a28cc0f1 100644
--- a/trunk/include/linux/semaphore.h
+++ b/trunk/include/linux/semaphore.h
@@ -61,6 +61,12 @@ extern void down(struct semaphore *sem);
  */
 extern int __must_check down_interruptible(struct semaphore *sem);
 
+/*
+ * As down_interruptible(), except the sleep may only be interrupted by
+ * signals which are fatal to this process.
+ */
+extern int __must_check down_killable(struct semaphore *sem);
+
 /*
  * As down(), except this function will not sleep.  It will return 0 if it
  * acquired the semaphore and 1 if the semaphore was contended.  This
diff --git a/trunk/kernel/semaphore.c b/trunk/kernel/semaphore.c
index d5a72702f261..2da2aed950f3 100644
--- a/trunk/kernel/semaphore.c
+++ b/trunk/kernel/semaphore.c
@@ -34,6 +34,7 @@
 
 static noinline void __down(struct semaphore *sem);
 static noinline int __down_interruptible(struct semaphore *sem);
+static noinline int __down_killable(struct semaphore *sem);
 static noinline void __up(struct semaphore *sem);
 
 void down(struct semaphore *sem)
@@ -61,6 +62,20 @@ int down_interruptible(struct semaphore *sem)
 }
 EXPORT_SYMBOL(down_interruptible);
 
+int down_killable(struct semaphore *sem)
+{
+	unsigned long flags;
+	int result = 0;
+
+	spin_lock_irqsave(&sem->lock, flags);
+	if (unlikely(sem->count-- <= 0))
+		result = __down_killable(sem);
+	spin_unlock_irqrestore(&sem->lock, flags);
+
+	return result;
+}
+EXPORT_SYMBOL(down_killable);
+
 /**
  * down_trylock - try to acquire the semaphore, without waiting
  * @sem: the semaphore to be acquired
@@ -143,6 +158,8 @@ static inline int __sched __down_common(struct semaphore *sem, long state)
 	for (;;) {
 		if (state == TASK_INTERRUPTIBLE && signal_pending(task))
 			goto interrupted;
+		if (state == TASK_KILLABLE && fatal_signal_pending(task))
+			goto interrupted;
 		__set_task_state(task, state);
 		spin_unlock_irq(&sem->lock);
 		schedule();
@@ -178,6 +195,11 @@ static noinline int __sched __down_interruptible(struct semaphore *sem)
 	return __down_common(sem, TASK_INTERRUPTIBLE);
 }
 
+static noinline int __sched __down_killable(struct semaphore *sem)
+{
+	return __down_common(sem, TASK_KILLABLE);
+}
+
 static noinline void __sched __up(struct semaphore *sem)
 {
 	if (unlikely(list_empty(&sem->wait_list)))