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

* grub-core/disk/diskfilter.c (insert_array): Remove scanner_name

Browse source 
argument since it can be deduced from diskfilter. All users updated.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-26 22:53:21 +01:00
parent eece3349ea
commit 6cf1363b8f
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-26 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/diskfilter.c (insert_array): Remove scanner_name
argument since it can be deduced from diskfilter.
2012-02-26 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-26 Vladimir Serbinenko <phcoder@gmail.com>
Remove prio_list. Remove prio_list.

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

@ -107,7 +107,7 @@ is_lv_readable (struct grub_diskfilter_lv *lv)
static grub_err_t static grub_err_t
insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id, insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
struct grub_diskfilter_vg *array, struct grub_diskfilter_vg *array,
grub_disk_addr_t start_sector, const char *scanner_name, grub_disk_addr_t start_sector,
grub_diskfilter_t diskfilter __attribute__ ((unused))); grub_diskfilter_t diskfilter __attribute__ ((unused)));
static int static int
@ -146,8 +146,7 @@ scan_disk (const char *name)
id.uuidlen = 0; id.uuidlen = 0;
arr = diskfilter->detect (disk, &id, &start_sector); arr = diskfilter->detect (disk, &id, &start_sector);
if (arr && if (arr &&
(! insert_array (disk, &id, arr, start_sector, diskfilter->name, (! insert_array (disk, &id, arr, start_sector, diskfilter)))
diskfilter)))
{ {
if (id.uuidlen) if (id.uuidlen)
grub_free (id.uuid); grub_free (id.uuid);
@ -952,16 +951,16 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
static grub_err_t static grub_err_t
insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id, insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
struct grub_diskfilter_vg *array, struct grub_diskfilter_vg *array,
grub_disk_addr_t start_sector, const char *scanner_name, grub_disk_addr_t start_sector,
grub_diskfilter_t diskfilter __attribute__ ((unused))) grub_diskfilter_t diskfilter __attribute__ ((unused)))
{ {
struct grub_diskfilter_pv *pv; struct grub_diskfilter_pv *pv;
grub_dprintf ("diskfilter", "Inserting %s into %s (%s)\n", disk->name, grub_dprintf ("diskfilter", "Inserting %s into %s (%s)\n", disk->name,
array->name, scanner_name); array->name, diskfilter->name);
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
grub_util_info ("Inserting %s into %s (%s)\n", disk->name, grub_util_info ("Inserting %s into %s (%s)\n", disk->name,
array->name, scanner_name); array->name, diskfilter->name);
array->driver = diskfilter; array->driver = diskfilter;
#endif #endif