Re: [Patch] Robustly search for ZFS labels & uberblocks

[Vladimir 'φ-coder/phcoder' Serbinenko]

On 02.02.2012 12:13, Richard Laager wrote:
> Attached are two more patches to add to the stack.
Committed (see below for comments). Next time please attach ChangeLog 
entry and use -p on diff.
> -- Richard
>
> zfs-on-linux-rlaager10.patch
>
>
> Index: grub/util/grub-probe.c
> ===================================================================
> --- grub.orig/util/grub-probe.c 2012-02-02 03:36:38.827815635 -0600
> +++ grub/util/grub-probe.c      2012-02-02 03:39:22.727085000 -0600
> @@ -323,6 +323,11 @@
>     if (path != NULL)
>       {
>         grub_path = canonicalize_file_name (path);
> +      if (! grub_path)
> +       {
> +         grub_util_error (_("failed to get canonical path of %s"), path);
> +         return;
> +       }
No need to return. grub_util_error never returns.
> Index: grub/util/grub-probe.c
> ===================================================================
> --- grub.orig/util/grub-probe.c 2012-02-02 04:04:16.154167324 -0600
> +++ grub/util/grub-probe.c      2012-02-02 04:07:11.916090000 -0600
> @@ -363,6 +363,16 @@
>       }
>     *curdrive = 0;
>
> +  if (print == PRINT_DRIVE)
> +    {
> +      for (curdrive = drives_names; *curdrive; curdrive++)
> +       {
> +         printf ("(%s)", *curdrive);
> +         putchar (delim);
> +       }
> +      return;
It should be goto end;
> +    }
> +
>     if (print == PRINT_FS || print == PRINT_FS_UUID
>         || print == PRINT_FS_LABEL)
>       {


--
Regards
Vladimir 'φ-coder/phcoder' Serbinenko