remove kernel/kthread.c:kthread_stop_sem()

RFC PATCH In review Adrian Bunk 3 participants 3 messages Jul 7, 2006

lore

Share & tools

lore

Adrian Bunk

author

2006-07-07 20:45 UTC #0 lore raw

RFC PATCH 1/1 remove kernel/kthread.c:kthread_stop_sem()

This patch moves the otherwise unused kthread_stop_sem() into kthread_stop().

Signed-off-by Adrian Bunk <[email protected]>

---

This patch was already sent on:
- 29 Jun 2006

 include/linux/kthread.h |   12 ------------
 kernel/kthread.c        |   14 ++------------
 2 files changed, 2 insertions(+), 24 deletions(-)

include/linux/kthread.h renamed from include/linux/kthread.h.old +0 -1

@@ -28,7 +28,6 @@
 
 void kthread_bind(struct task_struct *k, unsigned int cpu);
 int kthread_stop(struct task_struct *k);
-int kthread_stop_sem(struct task_struct *k, struct semaphore *s);
 int kthread_should_stop(void);
 
 #endif /* _LINUX_KTHREAD_H */

kernel/kthread.c renamed from kernel/kthread.c.old +2 ~~-22~~

@@ -216,23 +216,6 @@
  */
 int kthread_stop(struct task_struct *k)
 {
-	return kthread_stop_sem(k, NULL);
-}
-EXPORT_SYMBOL(kthread_stop);
-
-/**
- * kthread_stop_sem - stop a thread created by kthread_create().
- * @k: thread created by kthread_create().
- * @s: semaphore that @k waits on while idle.
- *
- * Does essentially the same thing as kthread_stop() above, but wakes
- * @k by calling up(@s).
- *
- * Returns the result of threadfn(), or %-EINTR if wake_up_process()
- * was never called.
- */
-int kthread_stop_sem(struct task_struct *k, struct semaphore *s)
-{
 	int ret;
 
 	mutex_lock(&kthread_stop_lock);

@@ -246,10 +229,7 @@
 
 	/* Now set kthread_should_stop() to true, and wake it up. */
 	kthread_stop_info.k = k;
-	if (s)
-		up(s);
-	else
-		wake_up_process(k);
+	wake_up_process(k);
 	put_task_struct(k);
 
 	/* Once it dies, reset stop ptr, gather result and we're done. */

@@ -260,7 +240,7 @@
 
 	return ret;
 }
-EXPORT_SYMBOL(kthread_stop_sem);
+EXPORT_SYMBOL(kthread_stop);
 
 static __init int helper_init(void)
 {

Andrew Morton

2006-07-07 20:57 UTC #1 lore raw

Quoted 6 lines · Adrian Bunk

This patch moves the otherwise unused kthread_stop_sem() into kthread_stop().
Signed-off-by Adrian Bunk <[email protected]>

Quoted 9 lines

---

This patch was already sent on:
- 29 Jun 2006

 include/linux/kthread.h |   12 ------------
 kernel/kthread.c        |   14 ++------------
 2 files changed, 2 insertions(+), 24 deletions(-)

Hum, OK. That's basically a `patch -R' of Alan's
"[patch] Add kthread_stop_sem()".

Alan, are you OK with reverting that?

Alan Stern

2006-07-07 21:00 UTC #2 lore raw

Quoted 17 lines · Andrew Morton

Quoted 6 lines · Adrian Bunk
This patch moves the otherwise unused kthread_stop_sem() into kthread_stop().
Signed-off-by Adrian Bunk <[email protected]>
Quoted 9 lines
---
This patch was already sent on:
- 29 Jun 2006
 include/linux/kthread.h |   12 ------------
 kernel/kthread.c        |   14 ++------------
 2 files changed, 2 insertions(+), 24 deletions(-)

Quoted 4 lines

Hum, OK. That's basically a `patch -R' of Alan's
"[patch] Add kthread_stop_sem()".
Alan, are you OK with reverting that?

Yes. I wrote it originally for use with the SCSI error-handler thread, but then James Bottomley changed it so that it didn't wait on a semaphore. So if nobody else is using it, kthread_stop_sem() can go.

Alan Stern