vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix missing PVs if they don't contain "interesting" LV. Closes #38677.

Browse source 
Fix few warining messages and leaks while on it.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-11 00:08:27 +02:00
parent 9277a306a7
commit 49818a594a
4 changed files with 89 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
grub-core/disk/diskfilter.c
View file

@ -199,16 +199,8 @@ scan_disk (const char *name, int accept_diskfilter)
scan_depth--;
return 0;
}
if (scan_disk_partition_iter (disk, 0, (void *) name))
{
scan_depth--;
return 1;
}
if (grub_partition_iterate (disk, scan_disk_partition_iter, (void *) name))
{
scan_depth--;
return 1;
}
scan_disk_partition_iter (disk, 0, (void *) name);
grub_partition_iterate (disk, scan_disk_partition_iter, (void *) name);
grub_disk_close (disk);
scan_depth--;
return 0;

4
grub-core/kern/emu/hostdisk.c
View file

@ -431,7 +431,7 @@ grub_util_get_dm_node_linear_info (const char *dev,
uint64_t length, start;
char *target, *params;
char *ptr;
int major, minor;
int major = 0, minor = 0;
int first = 1;
grub_disk_addr_t partstart = 0;
@ -497,6 +497,8 @@ grub_util_get_dm_node_linear_info (const char *dev,
dm_task_destroy (dmt);
first = 0;
if (!dm_is_dm_major (major))
break;
}
if (first)
return 0;