Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6e63f90 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: fold ext4_nojournal_sops into ext4_sops 



There's no longer any need to have a separate set of super_operations
for nojournal mode.

Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent bb044576

fs/ext4/super.c

+1 −26
Original line number Diff line number Diff line
@@ -1123,27 +1123,6 @@ static const struct super_operations ext4_sops = { 
	.bdev_try_to_free_page = bdev_try_to_free_page,

};



static const struct super_operations ext4_nojournal_sops = {

	.alloc_inode	= ext4_alloc_inode,

	.destroy_inode	= ext4_destroy_inode,

	.write_inode	= ext4_write_inode,

	.dirty_inode	= ext4_dirty_inode,

	.drop_inode	= ext4_drop_inode,

	.evict_inode	= ext4_evict_inode,

	.sync_fs	= ext4_sync_fs,

	.freeze_fs	= ext4_freeze,

	.unfreeze_fs	= ext4_unfreeze,

	.put_super	= ext4_put_super,

	.statfs		= ext4_statfs,

	.remount_fs	= ext4_remount,

	.show_options	= ext4_show_options,

#ifdef CONFIG_QUOTA

	.quota_read	= ext4_quota_read,

	.quota_write	= ext4_quota_write,

#endif

	.bdev_try_to_free_page = bdev_try_to_free_page,

};



static const struct export_operations ext4_export_ops = {

	.fh_to_dentry = ext4_fh_to_dentry,

	.fh_to_parent = ext4_fh_to_parent,
@@ -3941,11 +3920,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	/*

	 * set up enough so that it can read an inode

	 */

	if (!test_opt(sb, NOLOAD) &&

	    EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_HAS_JOURNAL))

	sb->s_op = &ext4_sops;

	else

		sb->s_op = &ext4_nojournal_sops;

	sb->s_export_op = &ext4_export_ops;

	sb->s_xattr = ext4_xattr_handlers;

#ifdef CONFIG_QUOTA