shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-30 23:21:08 +03:00
Code

volume_id: also add readable check to probe_all()

Browse Source 
Otherwise probe_all will run two times into a timout, one
for the raid, and one for the filesystem probe. Thanks to
Tore Anderson for the debugging.
This commit is contained in:
Kay Sievers 2007-12-17 15:32:41 +01:00
parent be580fa5d8
commit 73ff769c90
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extras/volume_id/lib/volume_id.c
View File

@ -330,6 +330,14 @@ err:
return 0;
}
/* run only once into a timeout for unreadable devices */
static int device_is_readable(struct volume_id *id)
{
if (volume_id_get_buffer(id, 0x00, 0x200) != NULL)
return 1;
return 0;
}
/**
* volume_id_probe_raid:
* @id: Probing context.
@ -347,8 +355,7 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
if (id == NULL)
return -EINVAL;
/* run only once into a timeout for unreadable devices */
if (volume_id_get_buffer(id, 0x00, 0x200) == NULL)
if (!device_is_readable(id))
return -1;
info("probing at offset 0x%llx, size 0x%llx",
@ -382,8 +389,7 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
if (id == NULL)
return -EINVAL;
/* run only once into a timeout for unreadable devices */
if (volume_id_get_buffer(id, 0x00, 0x200) == NULL)
if (!device_is_readable(id))
return -1;
info("probing at offset 0x%llx, size 0x%llx",
@ -415,6 +421,9 @@ int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
if (id == NULL)
return -EINVAL;
if (!device_is_readable(id))
return -1;
/* probe for raid first, because fs probes may be successful on raid members */
if (volume_id_probe_raid(id, off, size) == 0)
return 0;