qemu-pr: fixed ioctl failed for multipath disk

We use ioctl to detect multipath devices.  However, we only set flags in
struct dm_ioctl (the argument to ioctl) and left other fields in random,
which may cause the failure of calling ioctl.  Hence, we set other
fields to 0 to avoid the failure.

Signed-off-by: wangjian161 <wangjian161@huawei.com>
This commit is contained in:
Chen Qun 2022-02-09 11:10:42 +08:00 committed by yezengruan
parent 5f9b6047bd
commit 95206472cc

View File

@ -0,0 +1,36 @@
From 56f59125707c0222bbb5d7f820792aba17c3db08 Mon Sep 17 00:00:00 2001
From: WangJian <wangjian161@huawei.com>
Date: Wed, 9 Feb 2022 11:10:42 +0800
Subject: [PATCH] qemu-pr: fixed ioctl failed for multipath disk
We use ioctl to detect multipath devices. However, we only set flags in
struct dm_ioctl (the argument to ioctl) and left other fields in random,
which may cause the failure of calling ioctl. Hence, we set other
fields to 0 to avoid the failure.
Signed-off-by: wangjian161 <wangjian161@huawei.com>
---
scsi/qemu-pr-helper.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
index f281daeced..bbb9b57741 100644
--- a/scsi/qemu-pr-helper.c
+++ b/scsi/qemu-pr-helper.c
@@ -288,9 +288,12 @@ static void multipath_pr_init(void)
static int is_mpath(int fd)
{
- struct dm_ioctl dm = { .flags = DM_NOFLUSH_FLAG };
+ struct dm_ioctl dm;
struct dm_target_spec *tgt;
+ memset(&dm, 0, sizeof(struct dm_ioctl));
+ dm.flags = DM_NOFLUSH_FLAG;
+
tgt = dm_dev_ioctl(fd, DM_TABLE_STATUS, &dm);
if (!tgt) {
if (errno == ENXIO) {
--
2.27.0