[Devel] [PATCH RHEL7 COMMIT] Revert "ext4: Module parameter to disable discard mount param on ploop"

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-957.12.2.vz7.96.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-957.12.2.vz7.96.5
------>
commit b6837a0629ec1c8417ef0dda64a7aada634a6d8c
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Mon May 27 15:57:18 2019 +0300

    Revert "ext4: Module parameter to disable discard mount param on ploop"
    
    This reverts commit e805a2a7f746da36c475e651b93d224938b1bb82.
    
    It's time to drop forcing discard mount option which was added for more
    intencive feature testing.
    
    https://jira.sw.ru/browse/PSBM-94130
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 fs/ext4/super.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 7f00f804cdba..623540274705 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -117,9 +117,6 @@ MODULE_ALIAS("ext3");
 #define IS_EXT3_SB(sb) (0)
 #endif
 
-ushort ext4_force_discard_on_ploop = 1;
-module_param_named(force_discard_on_ploop, ext4_force_discard_on_ploop, ushort, 0644);
-
 static int ext4_verify_csum_type(struct super_block *sb,
 				 struct ext4_super_block *es)
 {
@@ -3977,7 +3974,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 		set_opt(sb, ERRORS_RO);
 	if (def_mount_opts & EXT4_DEFM_BLOCK_VALIDITY)
 		set_opt(sb, BLOCK_VALIDITY);
-	if (def_mount_opts & EXT4_DEFM_DISCARD || (is_ploop(sb) && ext4_force_discard_on_ploop))
+	if (def_mount_opts & EXT4_DEFM_DISCARD || is_ploop(sb))
 		set_opt(sb, DISCARD);
 
 	sbi->s_resuid = make_kuid(&init_user_ns, le16_to_cpu(es->s_def_resuid));