[Devel] [PATCH RHEL7 COMMIT] ploop: move discard_* attributes in the tune_attributes group

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-693.17.1.vz7.45.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.17.1.vz7.45.6
------>
commit 2a0276702b9fd0484f5eae783752729d9a4a855d
Author: Andrei Vagin <avagin at openvz.org>
Date:   Thu Mar 1 11:17:35 2018 +0300

    ploop: move discard_* attributes in the tune_attributes group
    
    state_attributes contains only readonly attrebutes,
    all read-write attributes are in tune_attributes.
    
    Fixes: b1000c102485 ("ploop: allow to set discard granularity and alignment attributes")
    
    Reported-by: Konstantin Khorenko <khorenko at virtuozzo.com>
    Signed-off-by: Andrei Vagin <avagin at openvz.org>
---
 drivers/block/ploop/sysfs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/block/ploop/sysfs.c b/drivers/block/ploop/sysfs.c
index 835558a29777..48998373ae04 100644
--- a/drivers/block/ploop/sysfs.c
+++ b/drivers/block/ploop/sysfs.c
@@ -595,9 +595,6 @@ static struct attribute *state_attributes[] = {
 	_A(blockable_reqs),
 	_A(blocked_bios),
 	_A(freeze_state),
-	_A2(discard_granularity),
-	_A2(discard_alignment),
-	_A2(discard_zeroes_data),
 	NULL
 };
 
@@ -619,6 +616,9 @@ static struct attribute *tune_attributes[] = {
 	_A2(congestion_low_watermark),
 	_A2(max_active_requests),
 	_A2(push_backup_timeout),
+	_A2(discard_granularity),
+	_A2(discard_alignment),
+	_A2(discard_zeroes_data),
 	NULL
 };