Blame SOURCES/Grow-Do-not-shadow-an-existing-variable.patch
|
 |
b7f731 |
From 49948a3561dcd48a94b1c5e98a6d23c9263d1ca3 Mon Sep 17 00:00:00 2001
|
|
|
b7f731 |
From: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
|
b7f731 |
Date: Thu, 30 Mar 2017 10:46:01 -0400
|
|
|
b7f731 |
Subject: [RHEL7.5 PATCH 043/169] Grow: Do not shadow an existing variable
|
|
|
b7f731 |
|
|
|
b7f731 |
Declaring 'int rv' twice within the same function is asking for
|
|
|
b7f731 |
trouble.
|
|
|
b7f731 |
|
|
|
b7f731 |
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
|
|
|
b7f731 |
---
|
|
|
b7f731 |
Grow.c | 6 +++---
|
|
|
b7f731 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
b7f731 |
|
|
|
b7f731 |
diff --git a/Grow.c b/Grow.c
|
|
|
b7f731 |
index 0d551ce..0c16d5b 100755
|
|
|
b7f731 |
--- a/Grow.c
|
|
|
b7f731 |
+++ b/Grow.c
|
|
|
b7f731 |
@@ -1834,7 +1834,7 @@ int Grow_reshape(char *devname, int fd,
|
|
|
b7f731 |
* pre-requisite spare devices (mdmon owns final validation)
|
|
|
b7f731 |
*/
|
|
|
b7f731 |
if (st->ss->external) {
|
|
|
b7f731 |
- int rv;
|
|
|
b7f731 |
+ int retval;
|
|
|
b7f731 |
|
|
|
b7f731 |
if (subarray) {
|
|
|
b7f731 |
container = st->container_devnm;
|
|
|
b7f731 |
@@ -1852,9 +1852,9 @@ int Grow_reshape(char *devname, int fd,
|
|
|
b7f731 |
return 1;
|
|
|
b7f731 |
}
|
|
|
b7f731 |
|
|
|
b7f731 |
- rv = st->ss->load_container(st, cfd, NULL);
|
|
|
b7f731 |
+ retval = st->ss->load_container(st, cfd, NULL);
|
|
|
b7f731 |
|
|
|
b7f731 |
- if (rv) {
|
|
|
b7f731 |
+ if (retval) {
|
|
|
b7f731 |
pr_err("Cannot read superblock for %s\n",
|
|
|
b7f731 |
devname);
|
|
|
b7f731 |
free(subarray);
|
|
|
b7f731 |
--
|
|
|
b7f731 |
2.7.4
|
|
|
b7f731 |
|