38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
|
From 48f32788794e061ab0b359fe194c964849bb3040 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>
|
||
|
|
Signed-off-by: shaodenghui <shaodenghui@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 c6c6347e9b..655404fd07 100644
|
||
|
|
--- a/scsi/qemu-pr-helper.c
|
||
|
|
+++ b/scsi/qemu-pr-helper.c
|
||
|
|
@@ -285,9 +285,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
|
||
|
|
|