From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RtFyL-0005Yt-Ow for mharc-grub-devel@gnu.org; Fri, 03 Feb 2012 05:02:25 -0500 Received: from eggs.gnu.org ([140.186.70.92]:57949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtFyB-0005Jk-W4 for grub-devel@gnu.org; Fri, 03 Feb 2012 05:02:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RtFy7-0000qs-21 for grub-devel@gnu.org; Fri, 03 Feb 2012 05:02:15 -0500 Received: from mail-ww0-f49.google.com ([74.125.82.49]:53947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtFy6-0000qb-Jx for grub-devel@gnu.org; Fri, 03 Feb 2012 05:02:10 -0500 Received: by wgbdt13 with SMTP id dt13so2824314wgb.30 for ; Fri, 03 Feb 2012 02:02:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=c9iupNrxOq84gKYqfLf44IiY6HldNYi4fdZ/L3dZTqM=; b=NVwhDeZu+6SJhUN70lHCgyHkgOpDIs6puSyMUwourUvVVeOruP5M6p0wZG7LTBonQH hJeZpG7MnxYJJXvw7rN6QhI30goxy/opFbX9ufWEIjAS+jSM8EUw5/JbY7wlyM7pWi7X 825ataWNsv6y6Oup1hYp61QqpbA9MacHTHzIA= Received: by 10.180.92.71 with SMTP id ck7mr13327141wib.3.1328263329684; Fri, 03 Feb 2012 02:02:09 -0800 (PST) Received: from debian.x201.phnet (180-34.203-62.cust.bluewin.ch. [62.203.34.180]) by mx.google.com with ESMTPS id eq5sm15830880wib.2.2012.02.03.02.02.07 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 03 Feb 2012 02:02:08 -0800 (PST) Message-ID: <4F2BB09E.7010307@gmail.com> Date: Fri, 03 Feb 2012 11:02:06 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20120104 Icedove/8.0 MIME-Version: 1.0 To: Richard Laager Subject: Re: [Patch] Robustly search for ZFS labels & uberblocks References: <4E838F85.6060001@gmail.com> <1326973014.6387.224.camel@watermelon.coderich.net> <4F1C1ABD.1010303@gmail.com> <1327719035.9477.68.camel@watermelon.coderich.net> <4F23EF3C.9050407@gmail.com> <1327775600.9477.174.camel@watermelon.coderich.net> <4F25CB6C.7090204@gmail.com> <1327999542.3471.20.camel@watermelon.coderich.net> <1328181193.3572.71.camel@watermelon.coderich.net> In-Reply-To: <1328181193.3572.71.camel@watermelon.coderich.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.49 Cc: grub-devel@gnu.org, Zachary Bedell X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2012 10:02:24 -0000 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