1 ext4: fold ext4_nojournal_sops into ext4_sops
3 There's no longer any need to have a separate set of super_operations
6 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
8 fs/ext4/super.c | 27 +--------------------------
9 1 file changed, 1 insertion(+), 26 deletions(-)
11 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
12 index 921d5b4..e747b97 100644
15 @@ -1123,27 +1123,6 @@ static const struct super_operations ext4_sops = {
16 .bdev_try_to_free_page = bdev_try_to_free_page,
19 -static const struct super_operations ext4_nojournal_sops = {
20 - .alloc_inode = ext4_alloc_inode,
21 - .destroy_inode = ext4_destroy_inode,
22 - .write_inode = ext4_write_inode,
23 - .dirty_inode = ext4_dirty_inode,
24 - .drop_inode = ext4_drop_inode,
25 - .evict_inode = ext4_evict_inode,
26 - .sync_fs = ext4_sync_fs,
27 - .freeze_fs = ext4_freeze,
28 - .unfreeze_fs = ext4_unfreeze,
29 - .put_super = ext4_put_super,
30 - .statfs = ext4_statfs,
31 - .remount_fs = ext4_remount,
32 - .show_options = ext4_show_options,
34 - .quota_read = ext4_quota_read,
35 - .quota_write = ext4_quota_write,
37 - .bdev_try_to_free_page = bdev_try_to_free_page,
40 static const struct export_operations ext4_export_ops = {
41 .fh_to_dentry = ext4_fh_to_dentry,
42 .fh_to_parent = ext4_fh_to_parent,
43 @@ -3941,11 +3920,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
45 * set up enough so that it can read an inode
47 - if (!test_opt(sb, NOLOAD) &&
48 - EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_HAS_JOURNAL))
49 - sb->s_op = &ext4_sops;
51 - sb->s_op = &ext4_nojournal_sops;
52 + sb->s_op = &ext4_sops;
53 sb->s_export_op = &ext4_export_ops;
54 sb->s_xattr = ext4_xattr_handlers;