diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 20:16:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 20:16:53 -0400 |
| commit | 2031d0f586839bc68f35bcf8580b18947f8491d4 (patch) | |
| tree | e317615b4cb62350edeea0afe0a4fc94152cee29 /drivers/md/md.c | |
| parent | 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5 (diff) | |
| parent | 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73 (diff) | |
Merge Christoph's freeze cleanup patch
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 0c6b5b6baff6..3802f7a17f16 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -2976,8 +2976,7 @@ static int md_thread(void * arg) | |||
| 2976 | wait_event_interruptible_timeout(thread->wqueue, | 2976 | wait_event_interruptible_timeout(thread->wqueue, |
| 2977 | test_bit(THREAD_WAKEUP, &thread->flags), | 2977 | test_bit(THREAD_WAKEUP, &thread->flags), |
| 2978 | thread->timeout); | 2978 | thread->timeout); |
| 2979 | if (current->flags & PF_FREEZE) | 2979 | try_to_freeze(); |
| 2980 | refrigerator(PF_FREEZE); | ||
| 2981 | 2980 | ||
| 2982 | clear_bit(THREAD_WAKEUP, &thread->flags); | 2981 | clear_bit(THREAD_WAKEUP, &thread->flags); |
| 2983 | 2982 | ||