[PATCH 2/6] jbd: yield the device queue when waiting for commits
in [Kernel]
|
Prev: 2.6.34: simple IOMMU API extension to check safe interrupt remapping
Next: [PATCH 4/6] jbd: use WRITE_SYNC for journal I/O
From: Jeff Moyer on 2 Jul 2010 16:00 This patch gets CFQ back in line with deadline for iozone runs, especially those testing small files + fsync timings. Signed-off-by: Jeff Moyer <jmoyer(a)redhat.com> --- fs/jbd/journal.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 93d1e47..7bf7528 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c @@ -36,6 +36,7 @@ #include <linux/poison.h> #include <linux/proc_fs.h> #include <linux/debugfs.h> +#include <linux/blkdev.h> #include <asm/uaccess.h> #include <asm/page.h> @@ -183,6 +184,7 @@ loop: should_sleep = 0; if (should_sleep) { spin_unlock(&journal->j_state_lock); + blk_yield(journal->j_dev->bd_disk->queue, NULL); schedule(); spin_lock(&journal->j_state_lock); } @@ -549,6 +551,11 @@ int log_wait_commit(journal_t *journal, tid_t tid) while (tid_gt(tid, journal->j_commit_sequence)) { jbd_debug(1, "JBD: want %d, j_commit_sequence=%d\n", tid, journal->j_commit_sequence); + /* + * Give up our I/O scheduler time slice to allow the journal + * thread to issue I/O. + */ + blk_yield(journal->j_dev->bd_disk->queue, journal->j_task); wake_up(&journal->j_wait_commit); spin_unlock(&journal->j_state_lock); wait_event(journal->j_wait_done_commit, -- 1.6.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |