aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan Blunck <jblunck@suse.de>2010-04-14 08:38:35 -0400
committerJan Kara <jack@suse.cz>2010-05-21 13:30:39 -0400
commit20da9baf4cf9c627aaf7b00d64ce0b2221bab9bf (patch)
treeaab271acba35a0e0c83e29136471ceb267c76d45 /fs
parent269c8db30cf5b60f47a44bbceaac118b986895d8 (diff)
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')
-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 b2050032424f..09a88bf04579 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)
1163 struct ext2_super_block *es = EXT2_SB(sb)->s_es; 1163 struct ext2_super_block *es = EXT2_SB(sb)->s_es;
1164 1164
1165 lock_kernel(); 1165 lock_kernel();
1166 ext2_clear_super_error(sb);
1167
1168 if (es->s_state & cpu_to_le16(EXT2_VALID_FS)) { 1166 if (es->s_state & cpu_to_le16(EXT2_VALID_FS)) {
1169 ext2_debug("setting valid to 0\n"); 1167 ext2_debug("setting valid to 0\n");
1170 es->s_state &= cpu_to_le16(~EXT2_VALID_FS); 1168 es->s_state &= cpu_to_le16(~EXT2_VALID_FS);
1171 es->s_free_blocks_count =
1172 cpu_to_le32(ext2_count_free_blocks(sb));
1173 es->s_free_inodes_count =
1174 cpu_to_le32(ext2_count_free_inodes(sb));
1175 es->s_wtime = cpu_to_le32(get_seconds());
1176 ext2_sync_super(sb, es); 1169 ext2_sync_super(sb, es);
1177 } else { 1170 } else {
1178 ext2_commit_super(sb, es); 1171 ext2_commit_super(sb, es);