Skip to content

L
linux
Commit a550c42f authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

[PATCH] last jffs/jffs2 signal fix was wrong

parent 449b0db0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 9 deletions
fs/jffs/intrep.c
View file @ a550c42f
...@@ -3379,10 +3379,7 @@ jffs_garbage_collect_thread(void *ptr) ...@@ -3379,10 +3379,7 @@ jffs_garbage_collect_thread(void *ptr)
unsigned long signr = 0; unsigned long signr = 0;
spin_lock_irq(&current->sig->siglock); spin_lock_irq(&current->sig->siglock);
if (current->sig->shared_pending.head) signr = dequeue_signal(&current->blocked, &info);
signr = dequeue_signal(&current->sig->shared_pending, &info);
if (!signr)
signr = dequeue_signal(&current->pending, &info);
spin_unlock_irq(&current->sig->siglock); spin_unlock_irq(&current->sig->siglock);
switch(signr) { switch(signr) {
......
fs/jffs2/background.c
View file @ a550c42f
...@@ -66,7 +66,7 @@ void jffs2_stop_garbage_collect_thread(struct jffs2_sb_info *c) ...@@ -66,7 +66,7 @@ void jffs2_stop_garbage_collect_thread(struct jffs2_sb_info *c)
/* stop a eventually scheduled wbuf flush timer */ /* stop a eventually scheduled wbuf flush timer */
del_timer_sync(&c->wbuf_timer); del_timer_sync(&c->wbuf_timer);
/* make sure, that a scheduled wbuf flush task is completed */ /* make sure, that a scheduled wbuf flush task is completed */
flush_scheduled_tasks(); flush_scheduled_work();
} }
spin_lock_bh(&c->erase_completion_lock); spin_lock_bh(&c->erase_completion_lock);
...@@ -115,10 +115,7 @@ static int jffs2_garbage_collect_thread(void *_c) ...@@ -115,10 +115,7 @@ static int jffs2_garbage_collect_thread(void *_c)
unsigned long signr = 0 ; unsigned long signr = 0 ;
spin_lock_irq(&current->sig->siglock); spin_lock_irq(&current->sig->siglock);
if (current->sig->shared_pending.head) signr = dequeue_signal(&current->blocked, &info);
signr = dequeue_signal(&current->sig->shared_pending, &info);
if (!signr)
signr = dequeue_signal(&current->pending, &info);
spin_unlock_irq(&current->sig->siglock); spin_unlock_irq(&current->sig->siglock);
switch(signr) { switch(signr) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7