From b6180160f78f0182b296bdceed6419b26a6fccc7 Mon Sep 17 00:00:00 2001

From: Mariusz Tkaczyk <mariusz.tkaczyk@intel.com>

Date: Fri, 4 Oct 2019 12:07:28 +0200

Subject: [RHEL7.8 PATCH V2 42/47] imsm: save current_vol number

The imsm container_content routine will set curr_volume index in super

for getting volume information. This flag has never been restored to

original value, later other function may rely on it.

Restore this flag to original value.

Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@intel.com>

Signed-off-by: Jes Sorensen <jsorensen@fb.com>

---

 super-intel.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/super-intel.c b/super-intel.c

index a103a3f..e02bbd7 100644

--- a/super-intel.c

+++ b/super-intel.c

@@ -7826,6 +7826,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra

 	int sb_errors = 0;

 	struct dl *d;

 	int spare_disks = 0;

+	int current_vol = super->current_vol;

 	/* do not assemble arrays when not all attributes are supported */

 	if (imsm_check_attributes(mpb->attributes) == 0) {

@@ -7993,6 +7994,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra

 		rest = this;

 	}

+	super->current_vol = current_vol;

 	return rest;

 }

-- 

2.7.5