From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 7 Apr 2010 09:32:22 +0000 (+0200)
Subject: cdrom_id: check mount state in retry loop
X-Git-Tag: 174~570
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=d45c8c8b01c99180f15e24b22f7cf81eaf3cdd1b;p=elogind.git

cdrom_id: check mount state in retry loop

Based on a patch from Harald Hoyer.
---

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 7c9f8cc73..894a89057 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -547,6 +547,7 @@ int main(int argc, char *argv[])
 	const char *node = NULL;
 	int export = 0;
 	int fd = -1;
+	int cnt;
 	int rc = 0;
 
 	udev = udev_new();
@@ -592,21 +593,16 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	if (is_mounted(node)) {
-		fd = open(node, O_RDONLY|O_NONBLOCK);
-	} else {
-		int cnt;
+	srand((unsigned int)getpid());
+	for (cnt = 20; cnt > 0; cnt--) {
 		struct timespec duration;
 
-		srand((unsigned int)getpid());
-		for (cnt = 40; cnt > 0; cnt--) {
-			fd = open(node, O_RDONLY|O_NONBLOCK|O_EXCL);
-			if (fd >= 0 || errno != EBUSY)
-				break;
-			duration.tv_sec = 0;
-			duration.tv_nsec = (100 * 1000 * 1000) + (rand() % 100 * 1000 * 1000);
-			nanosleep(&duration, NULL);
-		}
+		fd = open(node, O_RDONLY|O_NONBLOCK|(is_mounted(node) ? 0 : O_EXCL));
+		if (fd >= 0 || errno != EBUSY)
+			break;
+		duration.tv_sec = 0;
+		duration.tv_nsec = (100 * 1000 * 1000) + (rand() % 100 * 1000 * 1000);
+		nanosleep(&duration, NULL);
 	}
 	if (fd < 0) {
 		info(udev, "unable to open '%s'\n", node);