Date: Tue, 17 May 2016 00:24:53 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299997 - head/sys/boot/i386/zfsboot Message-ID: <201605170024.u4H0Orra005519@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: peter Date: Tue May 17 00:24:53 2016 New Revision: 299997 URL: https://svnweb.freebsd.org/changeset/base/299997 Log: Attempt to fix r299660: slba is used only for the GPT case. elba is used if either GPT or LOADER_GELI_SUPPORT is enabled. Modified: head/sys/boot/i386/zfsboot/zfsboot.c Modified: head/sys/boot/i386/zfsboot/zfsboot.c ============================================================================== --- head/sys/boot/i386/zfsboot/zfsboot.c Tue May 17 00:23:46 2016 (r299996) +++ head/sys/boot/i386/zfsboot/zfsboot.c Tue May 17 00:24:53 2016 (r299997) @@ -397,10 +397,12 @@ probe_drive(struct dsk *dsk) struct gpt_hdr hdr; struct gpt_ent *ent; unsigned part, entries_per_sec; + daddr_t slba; #endif -#ifdef LOADER_GELI_SUPPORT - daddr_t slba, elba; +#if defined(GPT) || defined(LOADER_GELI_SUPPORT) + daddr_t elba; #endif + struct dos_partition *dp; char *sec; unsigned i;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605170024.u4H0Orra005519>