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

* grub-core/fs/zfs/zfsinfo.c (print_vdev_info): Fix RAIDZ reporting.

Browse source
This commit is contained in:
Massimo Maggi 2013-07-14 13:49:01 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent 8e67b50fdf
commit 53618046da
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
20013-07-14 Massimo Maggi <me@massimo-maggi.eu>
* grub-core/fs/zfs/zfsinfo.c (print_vdev_info): Fix RAIDZ reporting.
2013-07-13 Andrey Borzenkov <arvidjaar@gmail.com> 2013-07-13 Andrey Borzenkov <arvidjaar@gmail.com>
* docs/grub.texi (Commands): Document postition parameters * docs/grub.texi (Commands): Document postition parameters

20
grub-core/fs/zfs/zfsinfo.c
View file

@ -132,21 +132,31 @@ print_vdev_info (char *nvlist, int tab)
grub_free (path); grub_free (path);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
char is_mirror=(grub_strcmp(type,VDEV_TYPE_MIRROR) == 0);
char is_raidz=(grub_strcmp(type,VDEV_TYPE_RAIDZ) == 0);
if (grub_strcmp (type, VDEV_TYPE_MIRROR) == 0) if (is_mirror || is_raidz)
{ {
int nelm, i; int nelm, i;
nelm = grub_zfs_nvlist_lookup_nvlist_array_get_nelm nelm = grub_zfs_nvlist_lookup_nvlist_array_get_nelm
(nvlist, ZPOOL_CONFIG_CHILDREN); (nvlist, ZPOOL_CONFIG_CHILDREN);
if(is_mirror){
grub_puts_ (N_("This VDEV is a mirror"));
}
else if(is_raidz){
grub_uint64_t parity;
grub_zfs_nvlist_lookup_uint64(nvlist,"nparity",&parity);
grub_printf_ (N_("This VDEV is a RAIDZ%llu\n"),(unsigned long long)parity);
}
print_tabs (tab); print_tabs (tab);
if (nelm <= 0) if (nelm <= 0)
{ {
grub_puts_ (N_("Incorrect mirror")); grub_puts_ (N_("Incorrect VDEV"));
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
grub_printf_ (N_("Mirror with %d children\n"), nelm); grub_printf_ (N_("VDEV with %d children\n"), nelm);
print_state (nvlist, tab); print_state (nvlist, tab);
for (i = 0; i < nelm; i++) for (i = 0; i < nelm; i++)
{ {
@ -162,14 +172,14 @@ print_vdev_info (char *nvlist, int tab)
total element number. And the number itself is fine, total element number. And the number itself is fine,
only the element isn't. only the element isn't.
*/ */
grub_printf_ (N_("Mirror element number %d isn't correct\n"), i); grub_printf_ (N_("VDEV element number %d isn't correct\n"), i);
continue; continue;
} }
/* TRANSLATORS: it's the element carying the number %d, not /* TRANSLATORS: it's the element carying the number %d, not
total element number. This is used in enumeration total element number. This is used in enumeration
"Element number 1", "Element number 2", ... */ "Element number 1", "Element number 2", ... */
grub_printf_ (N_("Mirror element number %d:\n"), i); grub_printf_ (N_("VDEV element number %d:\n"), i);
print_vdev_info (child, tab + 1); print_vdev_info (child, tab + 1);
grub_free (child); grub_free (child);