[Devel,RHEL7,COMMIT] ploop: fix IS_PSTORAGE() macro: add check for "vstorage"

Submitted by Konstantin Khorenko on April 6, 2017, 8:58 a.m.

Details

Message ID 201704060858.v368wMW8014018@finist_cl7.x64_64.work.ct
State New
Series "ploop: fix IS_PSTORAGE() macro"
Headers show

Commit Message

Konstantin Khorenko April 6, 2017, 8:58 a.m. 
The commit is pushed to "branch-rh7-3.10.0-514.10.2.vz7.29.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.10.2.vz7.29.12
------>
commit 6800600cb6b9347b0c388bf2dbffec4affb6f1d4
Author: Maxim Patlasov <mpatlasov@virtuozzo.com>
Date:   Thu Apr 6 12:58:22 2017 +0400

    ploop: fix IS_PSTORAGE() macro: add check for "vstorage"
    
    "pstorage" was renamed to "vstorage"
    
    Signed-off-by: Maxim Patlasov <mpatlasov@virtuozzo.com>
---
 drivers/block/ploop/dev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox 

diff --git a/drivers/block/ploop/dev.c b/drivers/block/ploop/dev.c
index 09f5a41..e7aec54 100644
--- a/drivers/block/ploop/dev.c
+++ b/drivers/block/ploop/dev.c
@@ -3843,7 +3843,8 @@  static int ploop_truncate(struct ploop_device * plo, unsigned long arg)
 
 #define FUSE_SUPER_MAGIC 0x65735546
 #define IS_PSTORAGE(sb) (sb->s_magic == FUSE_SUPER_MAGIC && \
-			 !strcmp(sb->s_subtype, "pstorage"))
+			 (!strcmp(sb->s_subtype, "pstorage") || \
+			  !strcmp(sb->s_subtype, "vstorage")))
 
 static int ploop_bd_full(struct backing_dev_info *bdi, long long nr, int root)
 {