shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-05 15:21:37 +03:00
Code

cdrom_id: check mount state in retry loop

Browse Source 
Based on a patch from Harald Hoyer.
This commit is contained in:
Kay Sievers 2010-04-07 11:32:22 +02:00
parent cccfffbe04
commit d45c8c8b01
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
extras/cdrom_id/cdrom_id.c
View File

@ -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);