From owner-freebsd-current Thu Jan 9 16:51:44 2003 Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E1D9137B401 for ; Thu, 9 Jan 2003 16:51:42 -0800 (PST) Received: from ns1.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3B7843F13 for ; Thu, 9 Jan 2003 16:51:41 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from athlon.pn.xcllnt.net (athlon.pn.xcllnt.net [192.168.4.3]) by ns1.xcllnt.net (8.12.6/8.12.6) with ESMTP id h0A0pa2G018855; Thu, 9 Jan 2003 16:51:36 -0800 (PST) (envelope-from marcel@piii.pn.xcllnt.net) Received: from athlon.pn.xcllnt.net (localhost [127.0.0.1]) by athlon.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id h0A0pa9b010684; Thu, 9 Jan 2003 16:51:36 -0800 (PST) (envelope-from marcel@athlon.pn.xcllnt.net) Received: (from marcel@localhost) by athlon.pn.xcllnt.net (8.12.6/8.12.6/Submit) id h0A0patD010683; Thu, 9 Jan 2003 16:51:36 -0800 (PST) Date: Thu, 9 Jan 2003 16:51:36 -0800 From: Marcel Moolenaar To: Gordon Tetlow Cc: current@FreeBSD.org Subject: Re: HEADS UP: VFS changes breaks GPT Message-ID: <20030110005136.GA1425@athlon.pn.xcllnt.net> References: <20030109091230.GA4320@dhcp01.pn.xcllnt.net> <20030109235716.GA53114@roark.gnf.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030109235716.GA53114@roark.gnf.org> User-Agent: Mutt/1.5.1i Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, Jan 09, 2003 at 03:57:16PM -0800, Gordon Tetlow wrote: > On Thu, Jan 09, 2003 at 01:12:30AM -0800, Marcel Moolenaar wrote: > > Gang, > > > > GPT based systems are unable to mount the root file system. I > > haven't had the time to dig into this, but we must be making > > assumptions we previously didn't make. In any case ia64 is > > hosed. More to come... > > I'll own up to this one. I forgot about alignment issues on non-i386 > platforms when I committed rev 1.36 of src/sys/ufs/ffs/fs.h. I've > committed the fix that marcel has provided. If there are anymore > troubles, please don't hesitate in reverting to rev 1.35. Nah... :-) Jake has a good point and I've got a dotless i, so what about the following patch to dot the, well, i: \begin{patch} Index: fs.h =================================================================== RCS file: /home/ncvs/src/sys/ufs/ffs/fs.h,v retrieving revision 1.37 diff -u -r1.37 fs.h --- fs.h 9 Jan 2003 23:53:30 -0000 1.37 +++ fs.h 10 Jan 2003 00:50:17 -0000 @@ -312,7 +312,7 @@ u_char fs_fsmnt[MAXMNTLEN]; /* name mounted on */ u_char fs_volname[MAXVOLLEN]; /* volume name */ u_int64_t fs_swuid; /* system-wide uid */ - int32_t fs_pad; /* padding for non-i386 */ + int32_t fs_pad; /* due to alignment of fs_swuid */ /* these fields retain the current block allocation info */ int32_t fs_cgrotor; /* last cg searched */ void *fs_ocsp[NOCSPTRS]; /* padding; was list of fs_cs buffers */@@ -350,6 +350,11 @@ /* old fs_rotbloff */ int32_t fs_magic; /* magic number */ }; + +/* Sanity checking. */ +#ifdef CTASSERT +CTASSERT(sizeof(struct fs) == 1376); +#endif /* * Filesystem identification \end{patch} Note that the padding is not specific to non-i386. The reason or cause of the padding is specific to non-i386, because it's due to the alignment requirements of fs_swuid. A nit, but will probably avoid some confusion.. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message