From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753486AbZIXOml (ORCPT ); Thu, 24 Sep 2009 10:42:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753205AbZIXOmk (ORCPT ); Thu, 24 Sep 2009 10:42:40 -0400 Received: from brick.kernel.dk ([93.163.65.50]:44134 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753157AbZIXOkh (ORCPT ); Thu, 24 Sep 2009 10:40:37 -0400 From: Jens Axboe To: linux-kernel@vger.kernel.org Cc: fengguang.wu@intel.com, shaohua.li@intel.com, chris.mason@oracle.com, jack@suse.cz, Michael Rubin , Peter Zijlstra , Fengguang Wu , Jens Axboe Subject: [PATCH 05/10] writeback: cleanup writeback_single_inode() Date: Thu, 24 Sep 2009 16:40:31 +0200 Message-Id: <1253803236-20760-6-git-send-email-jens.axboe@oracle.com> X-Mailer: git-send-email 1.6.3.3.385.g60647 In-Reply-To: <1253803236-20760-1-git-send-email-jens.axboe@oracle.com> References: <1253803236-20760-1-git-send-email-jens.axboe@oracle.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wu Fengguang Make the if-else straight in writeback_single_inode(). No behavior change. Cc: Jan Kara Cc: Michael Rubin Cc: Peter Zijlstra Signed-off-by: Fengguang Wu Signed-off-by: Jens Axboe --- fs/fs-writeback.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 551684d..916e834 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -449,8 +449,13 @@ writeback_single_inode(struct inode *inode, struct writeback_control *wbc) spin_lock(&inode_lock); inode->i_state &= ~I_SYNC; if (!(inode->i_state & (I_FREEING | I_CLEAR))) { - if (!(inode->i_state & I_DIRTY) && - mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) { + if (inode->i_state & I_DIRTY) { + /* + * Someone redirtied the inode while were writing back + * the pages. + */ + redirty_tail(inode); + } else if (mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) { /* * We didn't write back all the pages. nfs_writepages() * sometimes bales out without doing anything. Redirty @@ -494,12 +499,6 @@ writeback_single_inode(struct inode *inode, struct writeback_control *wbc) inode->i_state |= I_DIRTY_PAGES; redirty_tail(inode); } - } else if (inode->i_state & I_DIRTY) { - /* - * Someone redirtied the inode while were writing back - * the pages. - */ - redirty_tail(inode); } else if (atomic_read(&inode->i_count)) { /* * The inode is clean, inuse -- 1.6.4.1.207.g68ea