Dan Williams: imsm: kill close() of component device

Martin F. Krafft madduck at alioth.debian.org
Tue Oct 27 19:21:31 UTC 2009


Module: mdadm
Branch: master
Commit: 51725a7c2569b764f59f009bc0ef42901a1ec915
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=51725a7c2569b764f59f009bc0ef42901a1ec915

Author: Dan Williams <dan.j.williams at intel.com>
Date:   Wed Sep 30 11:44:38 2009 -0700

imsm: kill close() of component device

None of the other formats close the passed in fd at load, and this
becomes a problem when trying to support --update where we need O_EXCL
protection across the entire operation.

Signed-off-by: Dan Williams <dan.j.williams at intel.com>

---

 super-intel.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/super-intel.c b/super-intel.c
index 9f57a68..80cd6c5 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -1685,10 +1685,8 @@ load_imsm_disk(int fd, struct intel_super *super, char *devname, int keep_fd)
 		serialcpy(dl->serial, serial);
 		dl->index = -2;
 		dl->e = NULL;
-	} else if (keep_fd) {
-		close(dl->fd);
+	} else if (keep_fd)
 		dl->fd = fd;
-	}
 
 	/* look up this disk's index in the current anchor */
 	for (i = 0; i < super->anchor->num_disks; i++) {




More information about the pkg-mdadm-commits mailing list