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 559022840f1dedc34eb72005a512d8eee9dac1e5
Author: Konstantin Khorenko <[email protected]>
Date: Mon May 27 15:58:49 2019 +0300
Revert "ext4: always imply discard mount option if undelying ploop is
detected"
This reverts commit e9ffd584ebbe18376818b2896fb6bc2847dd1e9c.
It's time to drop forcing discard mount option which was added for more
intensive feature testing.
https://jira.sw.ru/browse/PSBM-94130
Signed-off-by: Konstantin Khorenko <[email protected]>
---
fs/ext4/super.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 623540274705..e607d8b5235f 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3808,13 +3808,6 @@ static int ext4_reserve_clusters(struct ext4_sb_info
*sbi, ext4_fsblk_t count)
return 0;
}
-#define PLOOP_DEVICE_MAJOR 182
-
-static bool is_ploop(struct super_block *sb)
-{
- return sb->s_bdev->bd_disk->major == PLOOP_DEVICE_MAJOR;
-}
-
static int ext4_fill_super(struct super_block *sb, void *data, int silent)
{
struct dax_device *dax_dev = fs_dax_get_by_bdev(sb->s_bdev);
@@ -3974,7 +3967,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))
+ if (def_mount_opts & EXT4_DEFM_DISCARD)
set_opt(sb, DISCARD);
sbi->s_resuid = make_kuid(&init_user_ns, le16_to_cpu(es->s_def_resuid));
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
