diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-07-22 20:35:31 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2012-07-22 20:35:31 -0400 |
commit | 4d47603d9703e6fff8ff2618bc108d6280e2439d (patch) | |
tree | 82a0f9abc6bc10bb67d70fd811139f2bd2a3ce7b /fs/ext4/super.c | |
parent | 58c5873a769987e36265d1523d2aa5bdc18f32bd (diff) |
ext4: weed out ext4_write_super
We do not depend on VFS's '->write_super()' anymore and do not need
the 's_dirt' flag anymore, so weed out 'ext4_write_super()' and
's_dirt'.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r-- | fs/ext4/super.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 662e93e8c25b..a2a59796cde0 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -74,7 +74,6 @@ static const char *ext4_decode_error(struct super_block *sb, int errno, | |||
74 | static int ext4_remount(struct super_block *sb, int *flags, char *data); | 74 | static int ext4_remount(struct super_block *sb, int *flags, char *data); |
75 | static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf); | 75 | static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf); |
76 | static int ext4_unfreeze(struct super_block *sb); | 76 | static int ext4_unfreeze(struct super_block *sb); |
77 | static void ext4_write_super(struct super_block *sb); | ||
78 | static int ext4_freeze(struct super_block *sb); | 77 | static int ext4_freeze(struct super_block *sb); |
79 | static struct dentry *ext4_mount(struct file_system_type *fs_type, int flags, | 78 | static struct dentry *ext4_mount(struct file_system_type *fs_type, int flags, |
80 | const char *dev_name, void *data); | 79 | const char *dev_name, void *data); |
@@ -1210,7 +1209,6 @@ static const struct super_operations ext4_nojournal_sops = { | |||
1210 | .dirty_inode = ext4_dirty_inode, | 1209 | .dirty_inode = ext4_dirty_inode, |
1211 | .drop_inode = ext4_drop_inode, | 1210 | .drop_inode = ext4_drop_inode, |
1212 | .evict_inode = ext4_evict_inode, | 1211 | .evict_inode = ext4_evict_inode, |
1213 | .write_super = ext4_write_super, | ||
1214 | .put_super = ext4_put_super, | 1212 | .put_super = ext4_put_super, |
1215 | .statfs = ext4_statfs, | 1213 | .statfs = ext4_statfs, |
1216 | .remount_fs = ext4_remount, | 1214 | .remount_fs = ext4_remount, |
@@ -4364,7 +4362,6 @@ static int ext4_commit_super(struct super_block *sb, int sync) | |||
4364 | es->s_free_inodes_count = | 4362 | es->s_free_inodes_count = |
4365 | cpu_to_le32(percpu_counter_sum_positive( | 4363 | cpu_to_le32(percpu_counter_sum_positive( |
4366 | &EXT4_SB(sb)->s_freeinodes_counter)); | 4364 | &EXT4_SB(sb)->s_freeinodes_counter)); |
4367 | sb->s_dirt = 0; | ||
4368 | BUFFER_TRACE(sbh, "marking dirty"); | 4365 | BUFFER_TRACE(sbh, "marking dirty"); |
4369 | ext4_superblock_csum_set(sb, es); | 4366 | ext4_superblock_csum_set(sb, es); |
4370 | mark_buffer_dirty(sbh); | 4367 | mark_buffer_dirty(sbh); |
@@ -4471,13 +4468,6 @@ int ext4_force_commit(struct super_block *sb) | |||
4471 | return ret; | 4468 | return ret; |
4472 | } | 4469 | } |
4473 | 4470 | ||
4474 | static void ext4_write_super(struct super_block *sb) | ||
4475 | { | ||
4476 | lock_super(sb); | ||
4477 | ext4_commit_super(sb, 1); | ||
4478 | unlock_super(sb); | ||
4479 | } | ||
4480 | |||
4481 | static int ext4_sync_fs(struct super_block *sb, int wait) | 4471 | static int ext4_sync_fs(struct super_block *sb, int wait) |
4482 | { | 4472 | { |
4483 | int ret = 0; | 4473 | int ret = 0; |