[PATCH] make jffs/jffs2 work with signal changes

d7c13896 · Alan Cox · Linus Torvalds · 176dbba5 · d7c13896 · d7c13896
Commit d7c13896 authored Oct 06, 2002 by Alan Cox Committed by Linus Torvalds Oct 06, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

fs/jffs/intrep.c fs/jffs/intrep.c +5 -2

fs/jffs2/background.c fs/jffs2/background.c +5 -2

No files found.
--- a/fs/jffs/intrep.c
+++ b/fs/jffs/intrep.c
@@ -3376,10 +3376,13 @@ jffs_garbage_collect_thread(void *ptr)
 		 */
 		while (signal_pending(current)) {
 			siginfo_t info;
-			unsigned long signr;
+			unsigned long signr = 0;

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

 			switch(signr) {

--- a/fs/jffs2/background.c
+++ b/fs/jffs2/background.c
@@ -112,10 +112,13 @@ static int jffs2_garbage_collect_thread(void *_c)
                 */
                while (signal_pending(current)) {
                        siginfo_t info;
-                        unsigned long signr;
+                        unsigned long signr = 0 ;

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

                        switch(signr) {