From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754823Ab0GKCjN (ORCPT ); Sat, 10 Jul 2010 22:39:13 -0400 Received: from mga02.intel.com ([134.134.136.20]:51523 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754115Ab0GKCiM (ORCPT ); Sat, 10 Jul 2010 22:38:12 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.55,182,1278313200"; d="scan'208";a="637293545" Message-Id: <20100711021749.163345723@intel.com> User-Agent: quilt/0.48-1 Date: Sun, 11 Jul 2010 10:07:01 +0800 From: Wu Fengguang To: Andrew Morton CC: Christoph Hellwig , Dave Chinner , Martin Bligh , Michael Rubin , Peter Zijlstra , Wu Fengguang CC: Jan Kara CC: Peter Zijlstra cc: cc: Linux Memory Management List cc: LKML Subject: [PATCH 5/6] writeback: fix queue_io() ordering References: <20100711020656.340075560@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 Signed-off-by: Wu Fengguang --- fs/fs-writeback.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- linux-next.orig/fs/fs-writeback.c 2010-07-11 09:13:31.000000000 +0800 +++ linux-next/fs/fs-writeback.c 2010-07-11 09:13:32.000000000 +0800 @@ -252,11 +252,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); }