shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

scsi_id: add rand() in retry loop

Browse Source
This commit is contained in:
Kay Sievers 2010-04-07 09:22:30 +02:00
parent 09a5b335b5
commit 1c8dc990dc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extras/scsi_id/scsi_serial.c
View File

@ -863,21 +863,21 @@ int scsi_get_serial(struct udev *udev,
{
unsigned char page0[SCSI_INQ_BUFF_LEN];
int fd = -1;
int cnt = 10;
int cnt;
int ind;
int retval;
memset(dev_scsi->serial, 0, len);
dbg(udev, "opening %s\n", devname);
while (--cnt) {
const struct timespec duration = { 0, 500 * 1000 * 1000 };
srand((unsigned int)getpid());
for (cnt = 20; cnt > 0; cnt--) {
struct timespec duration;
fd = open(devname, O_RDONLY | O_NONBLOCK);
if (fd >= 0)
break;
info(udev, "%s: cannot open %s: %s\n", dev_scsi->kernel, devname, strerror(errno));
if (errno != EBUSY)
if (fd >= 0 || errno != EBUSY)
break;
duration.tv_sec = 0;
duration.tv_nsec = (200 * 1000 * 1000) + (rand() % 100 * 1000 * 1000);
nanosleep(&duration, NULL);
}
if (fd < 0)