From patchwork Fri Jul 2 19:58:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/6] jbd2: yield the device queue when waiting for journal commits Date: Fri, 02 Jul 2010 09:58:16 -0000 From: Jeff Moyer X-Patchwork-Id: 57766 Message-Id: <1278100699-24132-4-git-send-email-jmoyer@redhat.com> To: linux-ext4@vger.kernel.org Cc: axboe@kernel.dk, linux-kernel@vger.kernel.org, vgoyal@redhat.com, tao.ma@oracle.com, Jeff Moyer This patch gets CFQ back in line with deadline for iozone runs, especially those testing small files + fsync timings. Signed-off-by: Jeff Moyer --- fs/jbd2/journal.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index bc2ff59..6b5bf0f 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -41,6 +41,7 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include @@ -192,6 +193,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); } @@ -580,6 +582,11 @@ int jbd2_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,