2021-10-27 22:32:57 +00:00
|
|
|
From b8e065b82b1497217863e6288ef4b5f486370e9c Mon Sep 17 00:00:00 2001
|
|
|
|
|
Message-Id: <b8e065b82b1497217863e6288ef4b5f486370e9c@dist-git>
|
2020-08-27 18:56:47 +00:00
|
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
|
|
Date: Fri, 6 Mar 2020 15:52:24 +0100
|
|
|
|
|
Subject: [PATCH] RHEL: virutil: Accept non-block devices in virGetDeviceID()
|
|
|
|
|
|
|
|
|
|
If a caller wants to learn major or minor number for a device,
|
|
|
|
|
let them. There's no need to check if the device is a block
|
|
|
|
|
device here.
|
|
|
|
|
|
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1808390
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
|
|
Message-Id: <20200306145226.1610708-5-abologna@redhat.com>
|
|
|
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
|
|
---
|
|
|
|
|
src/util/virutil.c | 3 ---
|
|
|
|
|
1 file changed, 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/util/virutil.c b/src/util/virutil.c
|
2021-10-27 22:32:57 +00:00
|
|
|
index a916f30aa9..3396b3da9d 100644
|
2020-08-27 18:56:47 +00:00
|
|
|
--- a/src/util/virutil.c
|
|
|
|
|
+++ b/src/util/virutil.c
|
2021-10-27 22:32:57 +00:00
|
|
|
@@ -1333,9 +1333,6 @@ virGetDeviceID(const char *path, int *maj, int *min)
|
2020-08-27 18:56:47 +00:00
|
|
|
if (stat(path, &sb) < 0)
|
|
|
|
|
return -errno;
|
|
|
|
|
|
|
|
|
|
- if (!S_ISBLK(sb.st_mode))
|
|
|
|
|
- return -EINVAL;
|
|
|
|
|
-
|
|
|
|
|
if (maj)
|
|
|
|
|
*maj = major(sb.st_rdev);
|
|
|
|
|
if (min)
|
|
|
|
|
--
|
2021-10-27 22:32:57 +00:00
|
|
|
2.33.0
|
2020-08-27 18:56:47 +00:00
|
|
|
|
