diff options
author | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2007-05-05 15:24:05 -0400 |
---|---|---|
committer | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2007-05-05 15:24:05 -0400 |
commit | 05ec9e26be1f668ccba4ca54d9a4966c6208c611 (patch) | |
tree | f05d3437dd0f0623b139e109fe8a53e5ea336696 /fs/jfs | |
parent | 3cbb1c8e1a4787d3dc2951b7615d7bb3788c49a0 (diff) |
JFS: Fix race waking up jfsIO kernel thread
It's possible for a journal I/O request to be added to the log_redrive
queue and the jfsIO thread to be awakened after the thread releases
log_redrive_lock but before it sets its state to TASK_INTERRUPTIBLE.
The jfsIO thread should set the state before giving up the spinlock, so
the waking thread will really wake it.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'fs/jfs')
-rw-r--r-- | fs/jfs/jfs_logmgr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index ff7f1beec30d..16c62680fcd6 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c | |||
@@ -2354,12 +2354,13 @@ int jfsIOWait(void *arg) | |||
2354 | lbmStartIO(bp); | 2354 | lbmStartIO(bp); |
2355 | spin_lock_irq(&log_redrive_lock); | 2355 | spin_lock_irq(&log_redrive_lock); |
2356 | } | 2356 | } |
2357 | spin_unlock_irq(&log_redrive_lock); | ||
2358 | 2357 | ||
2359 | if (freezing(current)) { | 2358 | if (freezing(current)) { |
2359 | spin_unlock_irq(&log_redrive_lock); | ||
2360 | refrigerator(); | 2360 | refrigerator(); |
2361 | } else { | 2361 | } else { |
2362 | set_current_state(TASK_INTERRUPTIBLE); | 2362 | set_current_state(TASK_INTERRUPTIBLE); |
2363 | spin_unlock_irq(&log_redrive_lock); | ||
2363 | schedule(); | 2364 | schedule(); |
2364 | __set_current_state(TASK_RUNNING); | 2365 | __set_current_state(TASK_RUNNING); |
2365 | } | 2366 | } |