aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext2/super.c
diff options
context:
space:
mode:
authorJan Blunck <jblunck@suse.de>2010-04-14 14:38:35 +0200
committerJan Kara <jack@suse.cz>2010-05-21 19:30:39 +0200
commit20da9baf4cf9c627aaf7b00d64ce0b2221bab9bf (patch)
treeaab271acba35a0e0c83e29136471ceb267c76d45 /fs/ext2/super.c
parent269c8db30cf5b60f47a44bbceaac118b986895d8 (diff)
downloadkernel_samsung_smdk4412-20da9baf4cf9c627aaf7b00d64ce0b2221bab9bf.zip
kernel_samsung_smdk4412-20da9baf4cf9c627aaf7b00d64ce0b2221bab9bf.tar.gz
kernel_samsung_smdk4412-20da9baf4cf9c627aaf7b00d64ce0b2221bab9bf.tar.bz2
ext2: Remove duplicate code from ext2_sync_fs()
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 <jblunck@suse.de> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext2/super.c')
-rw-r--r--fs/ext2/super.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index b205003..09a88bf 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1163,16 +1163,9 @@ static int ext2_sync_fs(struct super_block *sb, int wait)
struct ext2_super_block *es = EXT2_SB(sb)->s_es;
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);