diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /fs/jffs2 | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/jffs2')
| -rw-r--r-- | fs/jffs2/background.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c index d568ae846741..8adebd3e43c6 100644 --- a/fs/jffs2/background.c +++ b/fs/jffs2/background.c | |||
| @@ -105,7 +105,7 @@ static int jffs2_garbage_collect_thread(void *_c) | |||
| 105 | 105 | ||
| 106 | /* Put_super will send a SIGKILL and then wait on the sem. | 106 | /* Put_super will send a SIGKILL and then wait on the sem. |
| 107 | */ | 107 | */ |
| 108 | while (signal_pending(current)) { | 108 | while (signal_pending(current) || freezing(current)) { |
| 109 | siginfo_t info; | 109 | siginfo_t info; |
| 110 | unsigned long signr; | 110 | unsigned long signr; |
| 111 | 111 | ||