From: Jan Kara Subject: [PATCH 1/7] writeback: Move clearing of I_SYNC into inode_sync_complete() Date: Tue, 20 Mar 2012 23:56:25 +0100 Message-ID: <1332284191-21076-2-git-send-email-jack@suse.cz> References: <1332284191-21076-1-git-send-email-jack@suse.cz> Cc: Christoph Hellwig , linux-fsdevel@vger.kernel.org, Jan Kara To: Wu Fengguang Return-path: Received: from cantor2.suse.de ([195.135.220.15]:47586 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755553Ab2CTW4o (ORCPT ); Tue, 20 Mar 2012 18:56:44 -0400 In-Reply-To: <1332284191-21076-1-git-send-email-jack@suse.cz> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Move clearing of I_SYNC into inode_sync_complete(). It is more logical to have clearing of I_SYNC bit and waking of waiters in one place. Also later we will have two places needing to clear I_SYNC and wake up waiters so this allows them to use the common helper. Moving of I_SYNC clearing to a later stage of writeback_single_inode() is safe since we hold i_lock all the time. Signed-off-by: Jan Kara --- fs/fs-writeback.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index be84e28..afeecbf 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -231,11 +231,7 @@ static void requeue_io(struct inode *inode, struct bdi_writeback *wb) static void inode_sync_complete(struct inode *inode) { - /* - * Prevent speculative execution through - * spin_unlock(&wb->list_lock); - */ - + inode->i_state &= ~I_SYNC; smp_mb(); wake_up_bit(&inode->i_state, __I_SYNC); } @@ -436,7 +432,6 @@ writeback_single_inode(struct inode *inode, struct bdi_writeback *wb, spin_lock(&wb->list_lock); spin_lock(&inode->i_lock); - inode->i_state &= ~I_SYNC; if (!(inode->i_state & I_FREEING)) { /* * Sync livelock prevention. Each inode is tagged and synced in -- 1.7.1