|
 |
7140c6 |
From dca80fcd5d15c37ecbd82763e6fe4aee8c077bf9 Mon Sep 17 00:00:00 2001
|
|
|
7140c6 |
From: Blazej Kucman <blazej.kucman@intel.com>
|
|
|
7140c6 |
Date: Tue, 15 Jun 2021 16:45:39 +0200
|
|
|
7140c6 |
Subject: [PATCH 09/15] Use dev_open in validate geometry container
|
|
|
7140c6 |
|
|
|
7140c6 |
Fix regression caused by the patch 1f5d54a06
|
|
|
7140c6 |
("Manage: Call validate_geometry when adding drive to external container")
|
|
|
7140c6 |
- mdmonitor passes to Manage() routine dev name as min:mjr.
|
|
|
7140c6 |
The open() used in validate_geometry_container()
|
|
|
7140c6 |
in both ddf and imsm requires path, replace open calls by dev_open,
|
|
|
7140c6 |
which allows to use dev path and min:mjr.
|
|
|
7140c6 |
|
|
|
7140c6 |
Signed-off-by: Blazej Kucman <blazej.kucman@intel.com>
|
|
|
7140c6 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
7140c6 |
---
|
|
|
7140c6 |
super-ddf.c | 2 +-
|
|
|
7140c6 |
super-intel.c | 2 +-
|
|
|
7140c6 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
7140c6 |
|
|
|
7140c6 |
diff --git a/super-ddf.c b/super-ddf.c
|
|
|
7140c6 |
index 80a40f8..dc8e512 100644
|
|
|
7140c6 |
--- a/super-ddf.c
|
|
|
7140c6 |
+++ b/super-ddf.c
|
|
|
7140c6 |
@@ -3463,7 +3463,7 @@ validate_geometry_ddf_container(struct supertype *st,
|
|
|
7140c6 |
if (!dev)
|
|
|
7140c6 |
return 1;
|
|
|
7140c6 |
|
|
|
7140c6 |
- fd = open(dev, O_RDONLY|O_EXCL, 0);
|
|
|
7140c6 |
+ fd = dev_open(dev, O_RDONLY|O_EXCL);
|
|
|
7140c6 |
if (fd < 0) {
|
|
|
7140c6 |
if (verbose)
|
|
|
7140c6 |
pr_err("ddf: Cannot open %s: %s\n",
|
|
|
7140c6 |
diff --git a/super-intel.c b/super-intel.c
|
|
|
7140c6 |
index fe45d93..5356ca5 100644
|
|
|
7140c6 |
--- a/super-intel.c
|
|
|
7140c6 |
+++ b/super-intel.c
|
|
|
7140c6 |
@@ -6668,7 +6668,7 @@ static int validate_geometry_imsm_container(struct supertype *st, int level,
|
|
|
7140c6 |
if (!dev)
|
|
|
7140c6 |
return 1;
|
|
|
7140c6 |
|
|
|
7140c6 |
- fd = open(dev, O_RDONLY|O_EXCL, 0);
|
|
|
7140c6 |
+ fd = dev_open(dev, O_RDONLY|O_EXCL);
|
|
|
7140c6 |
if (fd < 0) {
|
|
|
7140c6 |
if (verbose > 0)
|
|
|
7140c6 |
pr_err("imsm: Cannot open %s: %s\n",
|
|
|
7140c6 |
--
|
|
|
7140c6 |
2.7.5
|
|
|
7140c6 |
|