From owner-p4-projects@FreeBSD.ORG Thu Oct 12 03:00:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FC9116A47B; Thu, 12 Oct 2006 03:00:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A5DA16A40F for ; Thu, 12 Oct 2006 03:00:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0E4A43D5A for ; Thu, 12 Oct 2006 03:00:51 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9C30pd6070374 for ; Thu, 12 Oct 2006 03:00:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9C30pQq070368 for perforce@freebsd.org; Thu, 12 Oct 2006 03:00:51 GMT (envelope-from jb@freebsd.org) Date: Thu, 12 Oct 2006 03:00:51 GMT Message-Id: <200610120300.k9C30pQq070368@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 107718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Oct 2006 03:00:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=107718 Change 107718 by jb@jb_freebsd8 on 2006/10/12 03:00:48 Remove the sun4v simulator definitions. Affected files ... .. //depot/projects/dtrace/src/sys/ufs/ffs/fs.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/ufs/ffs/fs.h#4 (text+ko) ==== @@ -32,9 +32,7 @@ #ifndef _UFS_FFS_FS_H_ #define _UFS_FFS_FS_H_ -#ifdef SUN4V -#include "opt_simulator.h" -#endif + /* * Each disk drive contains some number of filesystems. * A filesystem consists of a number of cylinder groups. @@ -248,11 +246,6 @@ int64_t cs_spare[3]; /* future expansion */ }; -#ifdef SIMULATOR -typedef struct _quad { int val[2]; } squad_t; -#endif - - /* * Super block for an FFS filesystem. */ @@ -349,19 +342,11 @@ int32_t fs_maxsymlinklen; /* max length of an internal symlink */ int32_t fs_old_inodefmt; /* format of on-disk inodes */ u_int64_t fs_maxfilesize; /* maximum representable file size */ -#ifdef SIMULATOR - uint32_t junk; - squad_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */ - squad_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */ -#else int64_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */ int64_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */ -#endif int32_t fs_state; /* validate fs_clean field */ int32_t fs_old_postblformat; /* format of positional layout tables */ -#ifndef SIMULATOR int32_t fs_old_nrpos; /* number of rotational positions */ -#endif int32_t fs_spare5[2]; /* old fs_postbloff */ /* old fs_rotbloff */ int32_t fs_magic; /* magic number */ @@ -561,17 +546,10 @@ * quantities by using shifts and masks in place of divisions * modulos and multiplications. */ -#ifdef SIMULATOR -#define blkoff(fs, loc) /* calculates (loc % fs->fs_bsize) */ \ - ((loc) & ((fs)->fs_qbmask.val[0] | (fs)->fs_qbmask.val[1])) -#define fragoff(fs, loc) /* calculates (loc % fs->fs_fsize) */ \ - ((loc) & ((fs)->fs_qfmask.val[0] | (fs)->fs_qfmask.val[1])) -#else #define blkoff(fs, loc) /* calculates (loc % fs->fs_bsize) */ \ ((loc) & (fs)->fs_qbmask) #define fragoff(fs, loc) /* calculates (loc % fs->fs_fsize) */ \ ((loc) & (fs)->fs_qfmask) -#endif #define lfragtosize(fs, frag) /* calculates ((off_t)frag * fs->fs_fsize) */ \ (((off_t)(frag)) << (fs)->fs_fshift) #define lblktosize(fs, blk) /* calculates ((off_t)blk * fs->fs_bsize) */ \ @@ -583,17 +561,10 @@ ((loc) >> (fs)->fs_bshift) #define numfrags(fs, loc) /* calculates (loc / fs->fs_fsize) */ \ ((loc) >> (fs)->fs_fshift) -#ifdef SIMULATOR #define blkroundup(fs, size) /* calculates roundup(size, fs->fs_bsize) */ \ - (((size) + ((fs)->fs_qbmask.val[0] | (fs)->fs_qbmask.val[1])) & (fs)->fs_bmask) -#define fragroundup(fs, size) /* calculates roundup(size, fs->fs_fsize) */ \ - (((size) + ((fs)->fs_qfmask.val[0] | (fs)->fs_qfmask.val[1])) & (fs)->fs_fmask) -#else -#define blkroundup(fs, size) /* calculates roundup(size, fs->fs_bsize) */ \ (((size) + (fs)->fs_qbmask) & (fs)->fs_bmask) #define fragroundup(fs, size) /* calculates roundup(size, fs->fs_fsize) */ \ (((size) + (fs)->fs_qfmask) & (fs)->fs_fmask) -#endif #define fragstoblks(fs, frags) /* calculates (frags / fs->fs_frag) */ \ ((frags) >> (fs)->fs_fragshift) #define blkstofrags(fs, blks) /* calculates (blks * fs->fs_frag) */ \