Deleted Added
full compact
ufsread.c (141060) ufsread.c (172940)
1/*-
2 * Copyright (c) 2002 McAfee, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by Marshall
6 * Kirk McKusick and McAfee Research,, the Security Research Division of
7 * McAfee, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as
8 * part of the DARPA CHATS research program

--- 30 unchanged lines hidden (view full) ---

39 *
40 * This software is provided "AS IS" and without any express or
41 * implied warranties, including, without limitation, the implied
42 * warranties of merchantability and fitness for a particular
43 * purpose.
44 */
45
46#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002 McAfee, Inc.
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by Marshall
6 * Kirk McKusick and McAfee Research,, the Security Research Division of
7 * McAfee, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as
8 * part of the DARPA CHATS research program

--- 30 unchanged lines hidden (view full) ---

39 *
40 * This software is provided "AS IS" and without any express or
41 * implied warranties, including, without limitation, the implied
42 * warranties of merchantability and fitness for a particular
43 * purpose.
44 */
45
46#include <sys/cdefs.h>
47__FBSDID("$FreeBSD: head/sys/boot/common/ufsread.c 141060 2005-01-30 14:58:00Z rwatson $");
47__FBSDID("$FreeBSD: head/sys/boot/common/ufsread.c 172940 2007-10-24 21:33:00Z jhb $");
48
49#include <ufs/ufs/dinode.h>
50#include <ufs/ffs/fs.h>
48
49#include <ufs/ufs/dinode.h>
50#include <ufs/ffs/fs.h>
51#ifdef __i386__
51#if defined(__i386__) && !defined(GPTBOOT)
52/* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase
53 (see sys/ufs/ffs/fs.h rev 1.39) so that i386 boot loader (boot2) can
54 support both UFS1 and UFS2 again. */
55#undef cgbase
56#define cgbase(fs, c) ((ufs2_daddr_t)((fs)->fs_fpg * (c)))
57#endif
58
59/*

--- 233 unchanged lines hidden ---
52/* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase
53 (see sys/ufs/ffs/fs.h rev 1.39) so that i386 boot loader (boot2) can
54 support both UFS1 and UFS2 again. */
55#undef cgbase
56#define cgbase(fs, c) ((ufs2_daddr_t)((fs)->fs_fpg * (c)))
57#endif
58
59/*

--- 233 unchanged lines hidden ---