From d68823e01abafff1fe31cc163a78ddc6ab1773f7 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Mon, 2 Oct 2006 02:18:52 -0700
Subject: [PATCH] --- yaml --- r: 37855 b: refs/heads/master c:
 5e6b3f42edc20e988b186fbfb9eec174294222ea h: refs/heads/master i:   37853:
 5cd5ee4ec7c3a327f56efa3a32ec21c8d827e23c   37851:
 24125a25224f77f4bef2219e4b0c7ee1ae002be4   37847:
 fee948e242771a4647b8a51bd7256bd65b26c4b0   37839:
 80e0a87d168d7ec8177dae7ed89bcb9e6bb9e6bd   37823:
 8c65def8f783b4266fbcfa4364ee4dcf59a7b595 v: v3

---
 [refs]                |  2 +-
 trunk/fs/proc/array.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e41e2b23233f..7bd194098f6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fbaac005cab2f3b4d6999cdb32fb93d442c5cdb
+refs/heads/master: 5e6b3f42edc20e988b186fbfb9eec174294222ea
diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c
index c0e554971df0..279fbf542c88 100644
--- a/trunk/fs/proc/array.c
+++ b/trunk/fs/proc/array.c
@@ -244,6 +244,7 @@ static void collect_sigign_sigcatch(struct task_struct *p, sigset_t *ign,
 
 static inline char * task_sig(struct task_struct *p, char *buffer)
 {
+	unsigned long flags;
 	sigset_t pending, shpending, blocked, ignored, caught;
 	int num_threads = 0;
 	unsigned long qsize = 0;
@@ -255,10 +256,8 @@ static inline char * task_sig(struct task_struct *p, char *buffer)
 	sigemptyset(&ignored);
 	sigemptyset(&caught);
 
-	/* Gather all the data with the appropriate locks held */
-	read_lock(&tasklist_lock);
-	if (p->sighand) {
-		spin_lock_irq(&p->sighand->siglock);
+	rcu_read_lock();
+	if (lock_task_sighand(p, &flags)) {
 		pending = p->pending.signal;
 		shpending = p->signal->shared_pending.signal;
 		blocked = p->blocked;
@@ -266,9 +265,9 @@ static inline char * task_sig(struct task_struct *p, char *buffer)
 		num_threads = atomic_read(&p->signal->count);
 		qsize = atomic_read(&p->user->sigpending);
 		qlim = p->signal->rlim[RLIMIT_SIGPENDING].rlim_cur;
-		spin_unlock_irq(&p->sighand->siglock);
+		unlock_task_sighand(p, &flags);
 	}
-	read_unlock(&tasklist_lock);
+	rcu_read_unlock();
 
 	buffer += sprintf(buffer, "Threads:\t%d\n", num_threads);
 	buffer += sprintf(buffer, "SigQ:\t%lu/%lu\n", qsize, qlim);