]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
imsm: close removed drive fd.
authorMariusz Tkaczyk <mariusz.tkaczyk@intel.com>
Mon, 15 Jul 2019 07:25:35 +0000 (09:25 +0200)
committerJes Sorensen <jsorensen@fb.com>
Wed, 14 Aug 2019 12:54:04 +0000 (08:54 -0400)
When member drive fails, managemon prepares metadata update and adds
the drive to disk_mgmt_list with DISK_REMOVE flag. It fills only
minor and major. It is enough to recognize the device later.

Monitor thread while processing this update will remove the drive from
super only if it is a spare. It never removes failed member from
disks list. As a result, it still keeps opened descriptor to
non-existing device.

If removed drive is not a spare fill fd in disk_cfg structure
(prepared by managemon), monitor will close fd during freeing it.

Also set this drive fd to -1 in super to avoid double closing because
monitor will close the fd (if needed) while replacing removed drive
in array.

Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
super-intel.c

index d7e8a65fddba944b8631f57ddd50fc155f3e7c0b..a103a3fc0cdd6a32898e85f5c44de8a27c6b1552 100644 (file)
@@ -9200,6 +9200,9 @@ static int add_remove_disk_update(struct intel_super *super)
                                        remove_disk_super(super,
                                                          disk_cfg->major,
                                                          disk_cfg->minor);
+                               } else {
+                                       disk_cfg->fd = disk->fd;
+                                       disk->fd = -1;
                                }
                        }
                        /* release allocate disk structure */