Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754081Ab0DLUmO (ORCPT ); Mon, 12 Apr 2010 16:42:14 -0400 Received: from cantor.suse.de ([195.135.220.2]:38970 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753805Ab0DLUmE (ORCPT ); Mon, 12 Apr 2010 16:42:04 -0400 From: Jan Blunck To: Jan Kara , tytso@mit.edu Cc: Linux-Kernel Mailinglist , linux-ext4@vger.kernel.org, Frederic Weisbecker , Arnd Bergmann , Jan Blunck Subject: [PATCH 3/5] ext2: Remove duplicate code from ext2_sync_fs() Date: Mon, 12 Apr 2010 22:41:43 +0200 Message-Id: <1271104905-8804-4-git-send-email-jblunck@suse.de> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1271104905-8804-1-git-send-email-jblunck@suse.de> References: <1271104905-8804-1-git-send-email-jblunck@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1489 Lines: 41 Depending in the state (valid or unchecked) of the filesystem either ext2_sync_super() or ext2_commit_super() is called. If the filesystem is currently valid (it is checked), we first mark it unchecked and afterwards duplicate the work that ext2_sync_super() is doing later. Therefore this patch removes the duplicate code and calls ext2_sync_super() directly after marking the filesystem unchecked. Signed-off-by: Jan Blunck --- fs/ext2/super.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 4a17ca3..40fc8d5 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -1164,16 +1164,9 @@ static int ext2_sync_fs(struct super_block *sb, int wait) struct buffer_head *sbh = EXT2_SB(sb)->s_sbh; lock_kernel(); - ext2_clear_super_error(sb); - if (es->s_state & cpu_to_le16(EXT2_VALID_FS)) { ext2_debug("setting valid to 0\n"); es->s_state &= cpu_to_le16(~EXT2_VALID_FS); - es->s_free_blocks_count = - cpu_to_le32(ext2_count_free_blocks(sb)); - es->s_free_inodes_count = - cpu_to_le32(ext2_count_free_inodes(sb)); - es->s_wtime = cpu_to_le32(get_seconds()); ext2_sync_super(sb, es); } else { ext2_commit_super(sb, es); -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/