From 6cf1363b8f7accadf43872518b737df8070e94f4 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sun, 26 Feb 2012 22:53:21 +0100 Subject: [PATCH] * grub-core/disk/diskfilter.c (insert_array): Remove scanner_name argument since it can be deduced from diskfilter. All users updated. --- ChangeLog | 5 +++++ grub-core/disk/diskfilter.c | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b441ad83c..5b5813869 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-26 Vladimir Serbinenko + + * grub-core/disk/diskfilter.c (insert_array): Remove scanner_name + argument since it can be deduced from diskfilter. + 2012-02-26 Vladimir Serbinenko Remove prio_list. diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c index 875c7eae6..dc9dc8ef3 100644 --- a/grub-core/disk/diskfilter.c +++ b/grub-core/disk/diskfilter.c @@ -107,7 +107,7 @@ is_lv_readable (struct grub_diskfilter_lv *lv) static grub_err_t insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id, 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))); static int @@ -146,8 +146,7 @@ scan_disk (const char *name) id.uuidlen = 0; arr = diskfilter->detect (disk, &id, &start_sector); if (arr && - (! insert_array (disk, &id, arr, start_sector, diskfilter->name, - diskfilter))) + (! insert_array (disk, &id, arr, start_sector, diskfilter))) { if (id.uuidlen) grub_free (id.uuid); @@ -952,16 +951,16 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb, static grub_err_t insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id, 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))) { struct grub_diskfilter_pv *pv; grub_dprintf ("diskfilter", "Inserting %s into %s (%s)\n", disk->name, - array->name, scanner_name); + array->name, diskfilter->name); #ifdef GRUB_UTIL grub_util_info ("Inserting %s into %s (%s)\n", disk->name, - array->name, scanner_name); + array->name, diskfilter->name); array->driver = diskfilter; #endif