AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

JFS: call io_schedule() instead of schedule() to avoid deadlock

Browse Source 
The introduction of Jens Axboe's explicit i/o plugging patches introduced a
deadlock in jfs.  This was caused by the process initiating I/O not
unplugging the queue before waiting on the commit thread.  The commit
thread itself was waiting for that I/O to complete.  Calling io_schedule()
rather than schedule() unplugs the I/O queue avoiding the deadlock, and it
appears to be the right function to call in any case.

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
This commit is contained in:
Dave Kleikamp 2007-01-17 21:18:35 -06:00
parent 82d5b9a7c6
commit 4aa0d230c2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/jfs/jfs_lock.h
View File

@ -42,7 +42,7 @@ do { \
if (cond) \
break; \
unlock_cmd; \
schedule(); \
io_schedule(); \
lock_cmd; \
} \
current->state = TASK_RUNNING; \

2
fs/jfs/jfs_metapage.c
View File

@ -56,7 +56,7 @@ static inline void __lock_metapage(struct metapage *mp)
set_current_state(TASK_UNINTERRUPTIBLE);
if (metapage_locked(mp)) {
unlock_page(mp->page);
schedule();
io_schedule();
lock_page(mp->page);
}
} while (trylock_metapage(mp));

2
fs/jfs/jfs_txnmgr.c
View File

@ -135,7 +135,7 @@ static inline void TXN_SLEEP_DROP_LOCK(wait_queue_head_t * event)
add_wait_queue(event, &wait);
set_current_state(TASK_UNINTERRUPTIBLE);
TXN_UNLOCK();
schedule();
io_schedule();
current->state = TASK_RUNNING;
remove_wait_queue(event, &wait);
}