2002-10-08 19:14:54

by Alan Cox

[permalink] [raw]
Subject: PATCH: Fix 2.5 signal handling in jffs/jffs2

Ingo chamged it again 8)

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.2.5.41/fs/jffs/intrep.c linux.2.5.41-ac1/fs/jffs/intrep.c
--- linux.2.5.41/fs/jffs/intrep.c 2002-10-07 22:12:27.000000000 +0100
+++ linux.2.5.41-ac1/fs/jffs/intrep.c 2002-10-08 00:18:23.000000000 +0100
@@ -3380,9 +3380,9 @@

spin_lock_irq(&current->sig->siglock);
if (current->sig->shared_pending.head)
- signr = dequeue_signal(&current->sig->shared_pending, &current->blocked, &info);
+ signr = dequeue_signal(&current->sig->shared_pending, &info);
if (!signr)
- signr = dequeue_signal(&current->pending, &current->blocked, &info);
+ signr = dequeue_signal(&current->pending, &info);
spin_unlock_irq(&current->sig->siglock);

switch(signr) {
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.2.5.41/fs/jffs2/background.c linux.2.5.41-ac1/fs/jffs2/background.c
--- linux.2.5.41/fs/jffs2/background.c 2002-10-07 22:12:27.000000000 +0100
+++ linux.2.5.41-ac1/fs/jffs2/background.c 2002-10-08 00:19:01.000000000 +0100
@@ -116,9 +116,9 @@

spin_lock_irq(&current->sig->siglock);
if (current->sig->shared_pending.head)
- signr = dequeue_signal(&current->sig->shared_pending, &current->blocked, &info);
+ signr = dequeue_signal(&current->sig->shared_pending, &info);
if (!signr)
- signr = dequeue_signal(&current->pending, &current->blocked, &info);
+ signr = dequeue_signal(&current->pending, &info);
spin_unlock_irq(&current->sig->siglock);

switch(signr) {