new macro to calculate multiplication by fs_bsize

[unix-history] / usr / src / sys / ufs / ffs / fs.h

diff --git a/usr/src/sys/ufs/ffs/fs.h b/usr/src/sys/ufs/ffs/fs.h
index 08462ac..d3dadf2 100644 (file)
--- a/usr/src/sys/ufs/ffs/fs.h
+++ b/usr/src/sys/ufs/ffs/fs.h
@@ -1,6 +1,21 @@
-/* Copyright (c) 1981 Regents of the University of California */
-
-/*     fs.h    2.2     %G%     */
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)fs.h        7.8 (Berkeley) %G%
+ */

 
 /*
  * Each disk drive contains some number of file systems.
 
 /*
  * Each disk drive contains some number of file systems.


@@ -10,7 +25,7 @@
  * A file system is described by its super-block, which in turn
  * describes the cylinder groups.  The super-block is critical
  * data and is replicated in each cylinder group to protect against
  * A file system is described by its super-block, which in turn
  * describes the cylinder groups.  The super-block is critical
  * data and is replicated in each cylinder group to protect against

- * catastrophic loss.  This is done at mkfs time and the critical
+ * catastrophic loss.  This is done at `newfs' time and the critical

  * super-block data does not change, so the copies need not be
  * referenced further unless disaster strikes.
  *
  * super-block data does not change, so the copies need not be
  * referenced further unless disaster strikes.
  *


@@ -24,11 +39,19 @@
  * the ``cgbase(fs, cg)'' macro.
  *
  * The first boot and super blocks are given in absolute disk addresses.
  * the ``cgbase(fs, cg)'' macro.
  *
  * The first boot and super blocks are given in absolute disk addresses.

+ * The byte-offset forms are preferred, as they don't imply a sector size.
+ * The byte-offset forms are preferred, as they don't imply a sector size.

  */
 #define BBSIZE         8192
 #define SBSIZE         8192
  */
 #define BBSIZE         8192
 #define SBSIZE         8192

+#define        BBOFF           ((off_t)(0))
+#define        SBOFF           ((off_t)(BBOFF + BBSIZE))
+#define        BBOFF           ((off_t)(0))
+#define        SBOFF           ((off_t)(BBOFF + BBSIZE))
+#ifndef SECSIZE

 #define        BBLOCK          ((daddr_t)(0))
 #define        SBLOCK          ((daddr_t)(BBLOCK + BBSIZE / DEV_BSIZE))
 #define        BBLOCK          ((daddr_t)(0))
 #define        SBLOCK          ((daddr_t)(BBLOCK + BBSIZE / DEV_BSIZE))

+#endif SECSIZE

 
 /*
  * Addresses stored in inodes are capable of addressing fragments
 
 /*
  * Addresses stored in inodes are capable of addressing fragments


@@ -54,67 +77,8 @@
  * thus the root inode is 2. (inode 1 is no longer used for
  * this purpose, however numerous dump tapes make this
  * assumption, so we are stuck with it)
  * thus the root inode is 2. (inode 1 is no longer used for
  * this purpose, however numerous dump tapes make this
  * assumption, so we are stuck with it)

- * The lost+found directory is given the next available
- * inode when it is created by ``mkfs''.

  */
 #define        ROOTINO         ((ino_t)2)      /* i number of all roots */
  */
 #define        ROOTINO         ((ino_t)2)      /* i number of all roots */

-#define LOSTFOUNDINO   (ROOTINO + 1)
-
-/*
- * MINFREE gives the minimum acceptable percentage of file system
- * blocks which may be free. If the freelist drops below this level
- * only the superuser may continue to allocate blocks. This may
- * be set to 0 if no reserve of free blocks is deemed necessary,
- * however severe performance degredations will be observed if the
- * file system is run at greater than 90% full; thus the default
- * value of fs_minfree is 10%.
- *
- * Empirically the best trade-off between block fragmentation and
- * overall disk utilization at a loading of 90% comes with a
- * fragmentation of 4, thus the default fragment size is a fourth
- * of the block size.
- */
-#define MINFREE                10
-#define DESFRAG                4
-
-/*
- * Under current technology, most 300MB disks have 32 sectors and
- * 16 tracks, thus these are the defaults used for fs_nsect and 
- * fs_ntrak respectively.
- */
-#define DFLNSECT       32
-#define DFLNTRAK       16
-
-/*
- * Cylinder group related limits.
- *
- * For each cylinder we keep track of the availability of blocks at different
- * rotational positions, so that we can lay out the data to be picked
- * up with minimum rotational latency.  NRPOS is the number of rotational
- * positions which we distinguish.  With NRPOS 8 the resolution of our
- * summary information is 2ms for a typical 3600 rpm drive.
- *
- * ROTDELAY gives the minimum number of milliseconds to initiate
- * another disk transfer on the same cylinder. It is used in
- * determining the rotationally optimal layout for disk blocks
- * within a file; the default of fs_rotdelay is 2ms.
- */
-#define        NRPOS           8       /* number distinct rotational positions */
-#define ROTDELAY       2
-
-/*
- * Each file system has a number of inodes statically allocated.
- * We allocate one inode slot per NBPI bytes, expecting this
- * to be far more than we will ever need.
- *
- * MAXIPG bounds the number of inodes per cylinder group, and
- * is needed only to keep the structure simpler by having the
- * only a single variable size element (the free bit map).
- *
- * N.B.: MAXIPG must be a multiple of INOPB(fs).
- */
-#define        NBPI            2048
-#define        MAXIPG          2048    /* max number inodes/cyl group */

 
 /*
  * MINBSIZE is the smallest allowable block size.
 
 /*
  * MINBSIZE is the smallest allowable block size.


@@ -122,15 +86,10 @@
  * 2^32 with only two levels of indirection, MINBSIZE is set to 4096.
  * MINBSIZE must be big enough to hold a cylinder group block,
  * thus changes to (struct cg) must keep its size within MINBSIZE.
  * 2^32 with only two levels of indirection, MINBSIZE is set to 4096.
  * MINBSIZE must be big enough to hold a cylinder group block,
  * thus changes to (struct cg) must keep its size within MINBSIZE.

- * MAXCPG is limited only to dimension an array in (struct cg);
- * it can be made larger as long as that structures size remains
- * within the bounds dictated by MINBSIZE.
- * Note that super blocks are always of size MAXBSIZE,
- * and that MAXBSIZE must be >= MINBSIZE.
+ * Note that super blocks are always of size SBSIZE,
+ * and that both SBSIZE and MAXBSIZE must be >= MINBSIZE.

  */
 #define MINBSIZE       4096
  */
 #define MINBSIZE       4096

-#define        DESCPG          16      /* desired fs_cpg */
-#define        MAXCPG          32      /* maximum fs_cpg */

 
 /*
  * The path name on which the file system is mounted is maintained
 
 /*
  * The path name on which the file system is mounted is maintained


@@ -162,10 +121,11 @@ struct csum {
 /*
  * Super block for a file system.
  */
 /*
  * Super block for a file system.
  */

-#define        FS_MAGIC        0x110854
+#define        FS_MAGIC        0x011954

 struct fs
 {
 struct fs
 {

-       long    fs_magic;               /* magic number */
+       struct  fs *fs_link;            /* linked list of file systems */
+       struct  fs *fs_rlink;           /*     used for incore super blocks */

        daddr_t fs_sblkno;              /* addr of super-block in filesys */
        daddr_t fs_cblkno;              /* offset of cyl-block in filesys */
        daddr_t fs_iblkno;              /* offset of inode-blocks in filesys */
        daddr_t fs_sblkno;              /* addr of super-block in filesys */
        daddr_t fs_cblkno;              /* offset of cyl-block in filesys */
        daddr_t fs_iblkno;              /* offset of inode-blocks in filesys */


@@ -179,19 +139,40 @@ struct    fs
        long    fs_bsize;               /* size of basic blocks in fs */
        long    fs_fsize;               /* size of frag blocks in fs */
        long    fs_frag;                /* number of frags in a block in fs */
        long    fs_bsize;               /* size of basic blocks in fs */
        long    fs_fsize;               /* size of frag blocks in fs */
        long    fs_frag;                /* number of frags in a block in fs */

+/* these are configuration parameters */

        long    fs_minfree;             /* minimum percentage of free blocks */
        long    fs_rotdelay;            /* num of ms for optimal next block */
        long    fs_rps;                 /* disk revolutions per second */
        long    fs_minfree;             /* minimum percentage of free blocks */
        long    fs_rotdelay;            /* num of ms for optimal next block */
        long    fs_rps;                 /* disk revolutions per second */

+/* these fields can be computed from the others */

        long    fs_bmask;               /* ``blkoff'' calc of blk offsets */
        long    fs_fmask;               /* ``fragoff'' calc of frag offsets */
        long    fs_bshift;              /* ``lblkno'' calc of logical blkno */
        long    fs_fshift;              /* ``numfrags'' calc number of frags */
        long    fs_bmask;               /* ``blkoff'' calc of blk offsets */
        long    fs_fmask;               /* ``fragoff'' calc of frag offsets */
        long    fs_bshift;              /* ``lblkno'' calc of logical blkno */
        long    fs_fshift;              /* ``numfrags'' calc number of frags */

-       long    fs_sparecon[16];        /* reserved for future constants */
+/* these are configuration parameters */
+       long    fs_maxcontig;           /* max number of contiguous blks */
+       long    fs_maxbpg;              /* max number of blks per cyl group */
+/* these fields can be computed from the others */
+       long    fs_fragshift;           /* block to frag shift */
+       long    fs_fsbtodb;             /* fsbtodb and dbtofsb shift constant */
+       long    fs_sbsize;              /* actual size of super block */
+       long    fs_csmask;              /* csum block offset */
+       long    fs_csshift;             /* csum block number */
+       long    fs_nindir;              /* value of NINDIR */
+       long    fs_inopb;               /* value of INOPB */
+       long    fs_nspf;                /* value of NSPF */
+/* yet another configuration parameter */
+       long    fs_optim;               /* optimization preference, see below */
+/* these fields are derived from the hardware */
+       long    fs_npsect;              /* # sectors/track including spares */
+       long    fs_interleave;          /* hardware sector interleave */
+       long    fs_trackskew;           /* sector 0 skew, per track */
+       long    fs_headswitch;          /* head switch time, usec */
+       long    fs_trkseek;             /* track-to-track seek, usec */

 /* sizes determined by number of cylinder groups and their sizes */
        daddr_t fs_csaddr;              /* blk addr of cyl grp summary area */
        long    fs_cssize;              /* size of cyl grp summary area */
        long    fs_cgsize;              /* cylinder group size */
 /* sizes determined by number of cylinder groups and their sizes */
        daddr_t fs_csaddr;              /* blk addr of cyl grp summary area */
        long    fs_cssize;              /* size of cyl grp summary area */
        long    fs_cgsize;              /* cylinder group size */

-/* these fields should be derived from the hardware */
+/* these fields are derived from the hardware */

        long    fs_ntrak;               /* tracks per cylinder */
        long    fs_nsect;               /* sectors per track */
        long    fs_spc;                 /* sectors per cylinder */
        long    fs_ntrak;               /* tracks per cylinder */
        long    fs_nsect;               /* sectors per track */
        long    fs_spc;                 /* sectors per cylinder */


@@ -209,14 +190,46 @@ struct    fs
        char    fs_ronly;               /* mounted read-only flag */
        char    fs_flags;               /* currently unused flag */
        char    fs_fsmnt[MAXMNTLEN];    /* name mounted on */
        char    fs_ronly;               /* mounted read-only flag */
        char    fs_flags;               /* currently unused flag */
        char    fs_fsmnt[MAXMNTLEN];    /* name mounted on */

+       long    fs_dbsize;              /* hardware sector size */
+       long    fs_sparecon[31];        /* reserved for future constants */

 /* these fields retain the current block allocation info */
        long    fs_cgrotor;             /* last cg searched */
        struct  csum *fs_csp[MAXCSBUFS];/* list of fs_cs info buffers */
        long    fs_cpc;                 /* cyl per cycle in postbl */
 /* these fields retain the current block allocation info */
        long    fs_cgrotor;             /* last cg searched */
        struct  csum *fs_csp[MAXCSBUFS];/* list of fs_cs info buffers */
        long    fs_cpc;                 /* cyl per cycle in postbl */

-       short   fs_postbl[MAXCPG][NRPOS];/* head of blocks for each rotation */
-       u_char  fs_rotbl[1];            /* list of blocks for each rotation */
+       short   fs_opostbl[16][8];      /* old rotation block list head */
+       long    fs_sparecon[56];        /* reserved for future constants */
+       quad    fs_qbmask;              /* ~fs_bmask - for use with quad size */
+       quad    fs_qfmask;              /* ~fs_fmask - for use with quad size */
+       long    fs_postblformat;        /* format of positional layout tables */
+       long    fs_nrpos;               /* number of rotaional positions */
+       long    fs_postbloff;           /* (short) rotation block list head */
+       long    fs_rotbloff;            /* (u_char) blocks for each rotation */
+       long    fs_magic;               /* magic number */
+       u_char  fs_space[1];            /* list of blocks for each rotation */

 /* actually longer */
 };
 /* actually longer */
 };

+/*
+ * Preference for optimization.
+ */
+#define FS_OPTTIME     0       /* minimize allocation time */
+#define FS_OPTSPACE    1       /* minimize disk fragmentation */
+
+/*
+ * Rotational layout table format types
+ */
+#define FS_42POSTBLFMT         -1      /* 4.2BSD rotational table format */
+#define FS_DYNAMICPOSTBLFMT    1       /* dynamic rotational table format */
+/*
+ * Macros for access to superblock array structures
+ */
+#define fs_postbl(fs, cylno) \
+    (((fs)->fs_postblformat == FS_42POSTBLFMT) \
+    ? ((fs)->fs_opostbl[cylno]) \
+    : ((short *)((char *)(fs) + (fs)->fs_postbloff) + (cylno) * (fs)->fs_nrpos))
+#define fs_rotbl(fs) \
+    (((fs)->fs_postblformat == FS_42POSTBLFMT) \
+    ? ((fs)->fs_space) \
+    : ((u_char *)((char *)(fs) + (fs)->fs_rotbloff)))

 
 /*
  * Convert cylinder group to base address of its global summary info.
 
 /*
  * Convert cylinder group to base address of its global summary info.


@@ -224,25 +237,14 @@ struct    fs
  * N.B. This macro assumes that sizeof(struct csum) is a power of two.
  */
 #define fs_cs(fs, indx) \
  * N.B. This macro assumes that sizeof(struct csum) is a power of two.
  */
 #define fs_cs(fs, indx) \

-       fs_csp[(indx) / ((fs)->fs_bsize / sizeof(struct csum))] \
-       [(indx) % ((fs)->fs_bsize / sizeof(struct csum))]
-
-/*
- * MAXBPC bounds the size of the rotational layout tables and
- * is limited by the fact that the super block is of size SBSIZE.
- * The size of these tables is INVERSELY proportional to the block
- * size of the file system. It is aggravated by sector sizes that
- * are not powers of two, as this increases the number of cylinders
- * included before the rotational pattern repeats (fs_cpc).
- * Its size is derived from the number of bytes remaining in (struct fs)
- */
-#define        MAXBPC  (SBSIZE - sizeof (struct fs))
+       fs_csp[(indx) >> (fs)->fs_csshift][(indx) & ~(fs)->fs_csmask]

 
 /*
  * Cylinder group block for a file system.
  */
 
 /*
  * Cylinder group block for a file system.
  */

-#define        CG_MAGIC        0x092752
+#define        CG_MAGIC        0x090255

 struct cg {
 struct cg {

+       struct  cg *cg_link;            /* linked list of cyl groups */

        long    cg_magic;               /* magic number */
        time_t  cg_time;                /* time last written */
        long    cg_cgx;                 /* we are the cgx'th cylinder group */
        long    cg_magic;               /* magic number */
        time_t  cg_time;                /* time last written */
        long    cg_cgx;                 /* we are the cgx'th cylinder group */


@@ -254,28 +256,68 @@ struct    cg {
        long    cg_frotor;              /* position of last used frag */
        long    cg_irotor;              /* position of last used inode */
        long    cg_frsum[MAXFRAG];      /* counts of available frags */
        long    cg_frotor;              /* position of last used frag */
        long    cg_irotor;              /* position of last used inode */
        long    cg_frsum[MAXFRAG];      /* counts of available frags */

-       long    cg_btot[MAXCPG];        /* block totals per cylinder */
-       short   cg_b[MAXCPG][NRPOS];    /* positions of free blocks */
-       char    cg_iused[MAXIPG/NBBY];  /* used inode map */
-       char    cg_free[1];             /* free block map */
+       long    cg_btotoff;             /* (long) block totals per cylinder */
+       long    cg_boff;                /* (short) free block positions */
+       long    cg_iusedoff;            /* (char) used inode map */
+       long    cg_freeoff;             /* (u_char) free block map */
+       long    cg_nextfreeoff;         /* (u_char) next available space */
+       long    cg_sparecon[16];        /* reserved for future use */
+       u_char  cg_space[1];            /* space for cylinder group maps */

 /* actually longer */
 };
 /* actually longer */
 };

+/*
+ * Macros for access to cylinder group array structures
+ */
+#define cg_blktot(cgp) \
+    (((cgp)->cg_magic != CG_MAGIC) \
+    ? (((struct ocg *)(cgp))->cg_btot) \
+    : ((long *)((char *)(cgp) + (cgp)->cg_btotoff)))
+#define cg_blks(fs, cgp, cylno) \
+    (((cgp)->cg_magic != CG_MAGIC) \
+    ? (((struct ocg *)(cgp))->cg_b[cylno]) \
+    : ((short *)((char *)(cgp) + (cgp)->cg_boff) + (cylno) * (fs)->fs_nrpos))
+#define cg_inosused(cgp) \
+    (((cgp)->cg_magic != CG_MAGIC) \
+    ? (((struct ocg *)(cgp))->cg_iused) \
+    : ((char *)((char *)(cgp) + (cgp)->cg_iusedoff)))
+#define cg_blksfree(cgp) \
+    (((cgp)->cg_magic != CG_MAGIC) \
+    ? (((struct ocg *)(cgp))->cg_free) \
+    : ((u_char *)((char *)(cgp) + (cgp)->cg_freeoff)))
+#define cg_chkmagic(cgp) \
+    ((cgp)->cg_magic == CG_MAGIC || ((struct ocg *)(cgp))->cg_magic == CG_MAGIC)

 
 /*
 
 /*

- * MAXBPG bounds the number of blocks of data per cylinder group,
- * and is limited by the fact that cylinder groups are at most one block.
- * Its size is derived from the size of blocks and the (struct cg) size,
- * by the number of remaining bits.
+ * The following structure is defined
+ * for compatibility with old file systems.

  */
  */

-#define        MAXBPG(fs) \
-       (NBBY * ((fs)->fs_bsize - (sizeof (struct cg))) / (fs)->fs_frag)
+struct ocg {
+       struct  ocg *cg_link;           /* linked list of cyl groups */
+       struct  ocg *cg_rlink;          /*     used for incore cyl groups */
+       time_t  cg_time;                /* time last written */
+       long    cg_cgx;                 /* we are the cgx'th cylinder group */
+       short   cg_ncyl;                /* number of cyl's this cg */
+       short   cg_niblk;               /* number of inode blocks this cg */
+       long    cg_ndblk;               /* number of data blocks this cg */
+       struct  csum cg_cs;             /* cylinder summary information */
+       long    cg_rotor;               /* position of last used block */
+       long    cg_frotor;              /* position of last used frag */
+       long    cg_irotor;              /* position of last used inode */
+       long    cg_frsum[8];            /* counts of available frags */
+       long    cg_btot[32];            /* block totals per cylinder */
+       short   cg_b[32][8];            /* positions of free blocks */
+       char    cg_iused[256];          /* used inode map */
+       long    cg_magic;               /* magic number */
+       u_char  cg_free[1];             /* free block map */
+/* actually longer */
+};

 
 /*
  * Turn file system block numbers into disk block addresses.
  * This maps file system blocks to device size blocks.
  */
 
 /*
  * Turn file system block numbers into disk block addresses.
  * This maps file system blocks to device size blocks.
  */

-#define fsbtodb(fs, b) ((b) * ((fs)->fs_fsize / DEV_BSIZE))
-#define        dbtofsb(fs, b)  ((b) / ((fs)->fs_fsize / DEV_BSIZE))
+#define fsbtodb(fs, b) ((b) << (fs)->fs_fsbtodb)
+#define        dbtofsb(fs, b)  ((b) >> (fs)->fs_fsbtodb)

 
 /*
  * Cylinder group macros to locate things in cylinder groups.
 
 /*
  * Cylinder group macros to locate things in cylinder groups.


@@ -299,7 +341,7 @@ struct      cg {
 #define        itog(fs, x)     ((x) / (fs)->fs_ipg)
 #define        itod(fs, x) \
        ((daddr_t)(cgimin(fs, itog(fs, x)) + \
 #define        itog(fs, x)     ((x) / (fs)->fs_ipg)
 #define        itod(fs, x) \
        ((daddr_t)(cgimin(fs, itog(fs, x)) + \

-       (x) % (fs)->fs_ipg / INOPB(fs) * (fs)->fs_frag))
+       (blkstofrags((fs), (((x) % (fs)->fs_ipg) / INOPB(fs))))))

 
 /*
  * Give cylinder group number for a file system block.
 
 /*
  * Give cylinder group number for a file system block.


@@ -313,11 +355,13 @@ struct    cg {
  * Compute the cylinder and rotational position of a cyl block addr.
  */
 #define blkmap(fs, map, loc) \
  * Compute the cylinder and rotational position of a cyl block addr.
  */
 #define blkmap(fs, map, loc) \

-    (((map)[loc / NBBY] >> (loc % NBBY)) & (0xff >> (NBBY - (fs)->fs_frag)))
+    (((map)[(loc) / NBBY] >> ((loc) % NBBY)) & (0xff >> (NBBY - (fs)->fs_frag)))

 #define cbtocylno(fs, bno) \
 #define cbtocylno(fs, bno) \

-       ((bno) * NSPF(fs) / (fs)->fs_spc)
+    ((bno) * NSPF(fs) / (fs)->fs_spc)

 #define cbtorpos(fs, bno) \
 #define cbtorpos(fs, bno) \

-       ((bno) * NSPF(fs) % (fs)->fs_nsect * NRPOS / (fs)->fs_nsect)
+    (((bno) * NSPF(fs) % (fs)->fs_spc / (fs)->fs_nsect * (fs)->fs_trackskew + \
+     (bno) * NSPF(fs) % (fs)->fs_spc % (fs)->fs_nsect * (fs)->fs_interleave) % \
+     (fs)->fs_nsect * (fs)->fs_nrpos / (fs)->fs_npsect)

 
 /*
  * The following macros optimize certain frequently calculated
 
 /*
  * The following macros optimize certain frequently calculated


@@ -328,6 +372,8 @@ struct      cg {
        ((loc) & ~(fs)->fs_bmask)
 #define fragoff(fs, loc)       /* calculates (loc % fs->fs_fsize) */ \
        ((loc) & ~(fs)->fs_fmask)
        ((loc) & ~(fs)->fs_bmask)
 #define fragoff(fs, loc)       /* calculates (loc % fs->fs_fsize) */ \
        ((loc) & ~(fs)->fs_fmask)

+#define lblktosize(fs, blk)    /* calculates (blk * fs->fs_bsize) */ \
+       ((blk) << (fs)->fs_bshift)

 #define lblkno(fs, loc)                /* calculates (loc / fs->fs_bsize) */ \
        ((loc) >> (fs)->fs_bshift)
 #define numfrags(fs, loc)      /* calculates (loc / fs->fs_fsize) */ \
 #define lblkno(fs, loc)                /* calculates (loc / fs->fs_bsize) */ \
        ((loc) >> (fs)->fs_bshift)
 #define numfrags(fs, loc)      /* calculates (loc / fs->fs_fsize) */ \


@@ -336,35 +382,51 @@ struct    cg {
        (((size) + (fs)->fs_bsize - 1) & (fs)->fs_bmask)
 #define fragroundup(fs, size)  /* calculates roundup(size, fs->fs_fsize) */ \
        (((size) + (fs)->fs_fsize - 1) & (fs)->fs_fmask)
        (((size) + (fs)->fs_bsize - 1) & (fs)->fs_bmask)
 #define fragroundup(fs, size)  /* calculates roundup(size, fs->fs_fsize) */ \
        (((size) + (fs)->fs_fsize - 1) & (fs)->fs_fmask)

+#define fragstoblks(fs, frags) /* calculates (frags / fs->fs_frag) */ \
+       ((frags) >> (fs)->fs_fragshift)
+#define blkstofrags(fs, blks)  /* calculates (blks * fs->fs_frag) */ \
+       ((blks) << (fs)->fs_fragshift)
+#define fragnum(fs, fsb)       /* calculates (fsb % fs->fs_frag) */ \
+       ((fsb) & ((fs)->fs_frag - 1))
+#define blknum(fs, fsb)                /* calculates rounddown(fsb, fs->fs_frag) */ \
+       ((fsb) &~ ((fs)->fs_frag - 1))
+
+/*
+ * Determine the number of available frags given a
+ * percentage to hold in reserve
+ */
+#define freespace(fs, percentreserved) \
+       (blkstofrags((fs), (fs)->fs_cstotal.cs_nbfree) + \
+       (fs)->fs_cstotal.cs_nffree - ((fs)->fs_dsize * (percentreserved) / 100))

 
 /*
  * Determining the size of a file block in the file system.
  */
 #define blksize(fs, ip, lbn) \
 
 /*
  * Determining the size of a file block in the file system.
  */
 #define blksize(fs, ip, lbn) \

-       (((lbn) >= NDADDR || (ip)->i_size >= ((lbn) + 1) * (fs)->fs_bsize) \
+       (((lbn) >= NDADDR || (ip)->i_size >= ((lbn) + 1) << (fs)->fs_bshift) \

            ? (fs)->fs_bsize \
            : (fragroundup(fs, blkoff(fs, (ip)->i_size))))
 #define dblksize(fs, dip, lbn) \
            ? (fs)->fs_bsize \
            : (fragroundup(fs, blkoff(fs, (ip)->i_size))))
 #define dblksize(fs, dip, lbn) \

-       (((lbn) >= NDADDR || (dip)->di_size >= ((lbn) + 1) * (fs)->fs_bsize) \
+       (((lbn) >= NDADDR || (dip)->di_size >= ((lbn) + 1) << (fs)->fs_bshift) \

            ? (fs)->fs_bsize \
            : (fragroundup(fs, blkoff(fs, (dip)->di_size))))
 
 /*
  * Number of disk sectors per block; assumes DEV_BSIZE byte sector size.
  */
            ? (fs)->fs_bsize \
            : (fragroundup(fs, blkoff(fs, (dip)->di_size))))
 
 /*
  * Number of disk sectors per block; assumes DEV_BSIZE byte sector size.
  */

-#define        NSPB(fs)        ((fs)->fs_bsize / DEV_BSIZE)
-#define        NSPF(fs)        ((fs)->fs_fsize / DEV_BSIZE)
+#define        NSPB(fs)        ((fs)->fs_nspf << (fs)->fs_fragshift)
+#define        NSPF(fs)        ((fs)->fs_nspf)

 
 /*
  * INOPB is the number of inodes in a secondary storage block.
  */
 
 /*
  * INOPB is the number of inodes in a secondary storage block.
  */

-#define        INOPB(fs)       ((fs)->fs_bsize / sizeof (struct dinode))
-#define        INOPF(fs)       ((fs)->fs_fsize / sizeof (struct dinode))
+#define        INOPB(fs)       ((fs)->fs_inopb)
+#define        INOPF(fs)       ((fs)->fs_inopb >> (fs)->fs_fragshift)

 
 /*
  * NINDIR is the number of indirects in a file system block.
  */
 
 /*
  * NINDIR is the number of indirects in a file system block.
  */

-#define        NINDIR(fs)      ((fs)->fs_bsize / sizeof (daddr_t))
+#define        NINDIR(fs)      ((fs)->fs_nindir)

 
 #ifdef KERNEL
 struct fs *getfs();
 
 #ifdef KERNEL
 struct fs *getfs();