From patchwork Wed Apr 14 21:17:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Moyer X-Patchwork-Id: 50192 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 93260B7D27 for ; Thu, 15 Apr 2010 07:18:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756963Ab0DNVRw (ORCPT ); Wed, 14 Apr 2010 17:17:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16792 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756847Ab0DNVRM (ORCPT ); Wed, 14 Apr 2010 17:17:12 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3ELH8YA030268 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Apr 2010 17:17:09 -0400 Received: from segfault.boston.devel.redhat.com (segfault.boston.devel.redhat.com [10.16.60.26]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3ELH7ZG029029 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 14 Apr 2010 17:17:08 -0400 Received: from segfault.boston.devel.redhat.com (localhost [127.0.0.1]) by segfault.boston.devel.redhat.com (8.14.3/8.14.3) with ESMTP id o3ELH7fX031349; Wed, 14 Apr 2010 17:17:07 -0400 Received: (from jmoyer@localhost) by segfault.boston.devel.redhat.com (8.14.3/8.14.3/Submit) id o3ELH7Pm031348; Wed, 14 Apr 2010 17:17:07 -0400 From: Jeff Moyer To: jens.axboe@oracle.com Cc: linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, vgoyal@redhat.com, Jeff Moyer Subject: [PATCH 3/4] jbd: yield the device queue when waiting for commits Date: Wed, 14 Apr 2010 17:17:05 -0400 Message-Id: <1271279826-30294-4-git-send-email-jmoyer@redhat.com> In-Reply-To: <1271279826-30294-1-git-send-email-jmoyer@redhat.com> References: <1271279826-30294-1-git-send-email-jmoyer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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/jbd/journal.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index bd224ee..c1df4b2 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -549,6 +550,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); wake_up(&journal->j_wait_commit); spin_unlock(&journal->j_state_lock); wait_event(journal->j_wait_done_commit,