From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934107AbZJGIDn (ORCPT ); Wed, 7 Oct 2009 04:03:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934088AbZJGID1 (ORCPT ); Wed, 7 Oct 2009 04:03:27 -0400 Received: from mga03.intel.com ([143.182.124.21]:1895 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934071AbZJGIDP (ORCPT ); Wed, 7 Oct 2009 04:03:15 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,518,1249282800"; d="scan'208";a="195972054" Message-Id: <20091007074903.029403960@intel.com> User-Agent: quilt/0.48-1 Date: Wed, 07 Oct 2009 15:38:33 +0800 From: Wu Fengguang To: Andrew Morton CC: Theodore Tso , Christoph Hellwig , Dave Chinner , Chris Mason , Peter Zijlstra , "Li Shaohua" , "Myklebust Trond" , "jens.axboe@oracle.com" , Jan Kara , Nick Piggin , , Martin Bligh , Michael Rubin , Peter Zijlstra Cc: Wu Fengguang , LKML Subject: [PATCH 15/45] writeback: fix queue_io() ordering References: <20091007073818.318088777@intel.com> Content-Disposition: inline; filename=queue_io-fix.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This was not a bug, since b_io is empty for kupdate writeback. The next patch will do requeue_io() for non-kupdate writeback, so let's fix it. CC: Dave Chinner Cc: Martin Bligh Cc: Michael Rubin Cc: Peter Zijlstra Signed-off-by: Fengguang Wu --- fs/fs-writeback.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- linux.orig/fs/fs-writeback.c 2009-10-06 23:38:28.000000000 +0800 +++ linux/fs/fs-writeback.c 2009-10-06 23:38:42.000000000 +0800 @@ -375,11 +375,14 @@ static void move_expired_inodes(struct l } /* - * Queue all expired dirty inodes for io, eldest first. + * Queue all expired dirty inodes for io, eldest first: + * (newly dirtied) => b_dirty inodes + * => b_more_io inodes + * => remaining inodes in b_io => (dequeue for sync) */ static void queue_io(struct bdi_writeback *wb, unsigned long *older_than_this) { - list_splice_init(&wb->b_more_io, wb->b_io.prev); + list_splice_init(&wb->b_more_io, &wb->b_io); move_expired_inodes(&wb->b_dirty, &wb->b_io, older_than_this); }