From fc9bdb4ee5086fb706da0ee61f46487e735186b5 Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Wed, 2 May 2018 02:41:09 +0000 Subject: [PATCH] Clean enclosure_table when resetting num_enc_table_entries to zero. Garbage left there by r325363 in some scenarios found to lead to later enclosure mapping failures. MFC after: 1 week Sponsored by: iXsystems, Inc. --- sys/dev/mpr/mpr_mapping.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/mpr/mpr_mapping.c b/sys/dev/mpr/mpr_mapping.c index 6d90c79efca..690e76249fe 100644 --- a/sys/dev/mpr/mpr_mapping.c +++ b/sys/dev/mpr/mpr_mapping.c @@ -2385,6 +2385,8 @@ fail: * sc->mapping_table volumes tooi */ } + for (enc_idx = 0; enc_idx < sc->num_enc_table_entries; enc_idx++) + _mapping_clear_enc_entry(sc->enclosure_table + enc_idx); sc->num_enc_table_entries = 0; return (false); }