|
 |
cd8c44 |
From f1cc8ab9ab6a92c3cd94ab7590b46285e214681e Mon Sep 17 00:00:00 2001
|
|
|
cd8c44 |
From: Lukasz Florczak <lukasz.florczak@linux.intel.com>
|
|
|
cd8c44 |
Date: Tue, 15 Mar 2022 09:30:30 +0100
|
|
|
cd8c44 |
Subject: [PATCH 01/12] Unify error message.
|
|
|
cd8c44 |
|
|
|
cd8c44 |
Provide the same error message for the same error that can occur in Grow.c and super-intel.c.
|
|
|
cd8c44 |
|
|
|
cd8c44 |
Signed-off-by: Lukasz Florczak <lukasz.florczak@linux.intel.com>
|
|
|
cd8c44 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
cd8c44 |
---
|
|
|
cd8c44 |
Grow.c | 4 ++--
|
|
|
cd8c44 |
super-intel.c | 4 ++--
|
|
|
cd8c44 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
cd8c44 |
|
|
|
cd8c44 |
diff --git a/Grow.c b/Grow.c
|
|
|
cd8c44 |
index 9c6fc95e..9a947204 100644
|
|
|
cd8c44 |
--- a/Grow.c
|
|
|
cd8c44 |
+++ b/Grow.c
|
|
|
cd8c44 |
@@ -1001,8 +1001,8 @@ int remove_disks_for_takeover(struct supertype *st,
|
|
|
cd8c44 |
rv = 1;
|
|
|
cd8c44 |
sysfs_free(arrays);
|
|
|
cd8c44 |
if (rv) {
|
|
|
cd8c44 |
- pr_err("Error. Cannot perform operation on /dev/%s\n", st->devnm);
|
|
|
cd8c44 |
- pr_err("For this operation it MUST be single array in container\n");
|
|
|
cd8c44 |
+ pr_err("Error. Cannot perform operation on %s- for this operation "
|
|
|
cd8c44 |
+ "it MUST be single array in container\n", st->devnm);
|
|
|
cd8c44 |
return rv;
|
|
|
cd8c44 |
}
|
|
|
cd8c44 |
}
|
|
|
cd8c44 |
diff --git a/super-intel.c b/super-intel.c
|
|
|
cd8c44 |
index d5fad102..5ffa7636 100644
|
|
|
cd8c44 |
--- a/super-intel.c
|
|
|
cd8c44 |
+++ b/super-intel.c
|
|
|
cd8c44 |
@@ -11683,8 +11683,8 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
|
|
|
cd8c44 |
struct imsm_super *mpb = super->anchor;
|
|
|
cd8c44 |
|
|
|
cd8c44 |
if (mpb->num_raid_devs > 1) {
|
|
|
cd8c44 |
- pr_err("Error. Cannot perform operation on %s- for this operation it MUST be single array in container\n",
|
|
|
cd8c44 |
- geo->dev_name);
|
|
|
cd8c44 |
+ pr_err("Error. Cannot perform operation on %s- for this operation "
|
|
|
cd8c44 |
+ "it MUST be single array in container\n", geo->dev_name);
|
|
|
cd8c44 |
change = -1;
|
|
|
cd8c44 |
}
|
|
|
cd8c44 |
}
|
|
|
cd8c44 |
--
|
|
|
cd8c44 |
2.31.1
|
|
|
cd8c44 |
|