From: Fengguang Wu Subject: [PATCH 13/13] writeback: cleanup __sync_single_inode() Date: Tue, 15 Jan 2008 20:36:50 +0800 Message-ID: <400401294.20012@ustc.edu.cn> References: <20080115123637.518924046@mail.ustc.edu.cn> Cc: Michael Rubin , Peter Zijlstra To: Andrew Morton Return-path: Received: from smtp.ustc.edu.cn ([202.38.64.16]:48043 "HELO ustc.edu.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1751379AbYAOMsI (ORCPT ); Tue, 15 Jan 2008 07:48:08 -0500 Message-Id: <20080115124803.025520828@mail.ustc.edu.cn> Cc: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Content-Disposition: inline; filename=writeback-simplify-x.patch Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Make the if-else straight in __sync_single_inode(). No behavior change. Cc: Michael Rubin Cc: Peter Zijlstra Signed-off-by: Fengguang Wu --- fs/fs-writeback.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) --- linux-mm.orig/fs/fs-writeback.c +++ linux-mm/fs/fs-writeback.c @@ -254,8 +254,13 @@ __sync_single_inode(struct inode *inode, spin_lock(&inode_lock); inode->i_state &= ~I_SYNC; if (!(inode->i_state & I_FREEING)) { - 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. + */ + requeue_io(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. @@ -272,12 +277,6 @@ __sync_single_inode(struct inode *inode, * 2) fast writer during sync: give others a try */ requeue_io_wait(inode); - } else if (inode->i_state & I_DIRTY) { - /* - * Someone redirtied the inode while were writing back - * the pages. - */ - requeue_io(inode); } else if (atomic_read(&inode->i_count)) { /* * The inode is clean, inuse --