2010-01-31 13:54:10 +03:00
|
|
|
/* $NetBSD: fs.h,v 1.55 2010/01/31 10:54:10 mlelstv Exp $ */
|
1994-06-29 10:39:25 +04:00
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
/*
|
|
|
|
* Copyright (c) 1982, 1986, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
2003-08-07 20:26:28 +04:00
|
|
|
* 3. Neither the name of the University nor the names of its contributors
|
1994-06-08 15:41:58 +04:00
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*
|
1998-03-01 05:20:01 +03:00
|
|
|
* @(#)fs.h 8.13 (Berkeley) 3/21/95
|
1994-06-08 15:41:58 +04:00
|
|
|
*/
|
|
|
|
|
2009-06-28 13:26:18 +04:00
|
|
|
/*
|
|
|
|
* NOTE: COORDINATE ON-DISK FORMAT CHANGES WITH THE FREEBSD PROJECT.
|
|
|
|
*/
|
|
|
|
|
2001-07-27 05:28:06 +04:00
|
|
|
#ifndef _UFS_FFS_FS_H_
|
|
|
|
#define _UFS_FFS_FS_H_
|
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
/*
|
|
|
|
* Each disk drive contains some number of file systems.
|
|
|
|
* A file system consists of a number of cylinder groups.
|
|
|
|
* Each cylinder group has inodes and data.
|
|
|
|
*
|
|
|
|
* 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 `newfs' time and the critical
|
|
|
|
* super-block data does not change, so the copies need not be
|
|
|
|
* referenced further unless disaster strikes.
|
|
|
|
*
|
|
|
|
* For file system fs, the offsets of the various blocks of interest
|
|
|
|
* are given in the super block as:
|
|
|
|
* [fs->fs_sblkno] Super-block
|
|
|
|
* [fs->fs_cblkno] Cylinder group block
|
|
|
|
* [fs->fs_iblkno] Inode blocks
|
|
|
|
* [fs->fs_dblkno] Data blocks
|
|
|
|
* The beginning of cylinder group cg in fs, is given by
|
|
|
|
* the ``cgbase(fs, cg)'' macro.
|
|
|
|
*
|
2003-04-02 14:39:19 +04:00
|
|
|
* Depending on the architecture and the media, the superblock may
|
2005-02-27 01:31:44 +03:00
|
|
|
* reside in any one of four places. For tiny media where every block
|
2003-04-02 14:39:19 +04:00
|
|
|
* counts, it is placed at the very front of the partition. Historically,
|
|
|
|
* UFS1 placed it 8K from the front to leave room for the disk label and
|
|
|
|
* a small bootstrap. For UFS2 it got moved to 64K from the front to leave
|
|
|
|
* room for the disk label and a bigger bootstrap, and for really piggy
|
|
|
|
* systems we check at 256K from the front if the first three fail. In
|
|
|
|
* all cases the size of the superblock will be SBLOCKSIZE. All values are
|
|
|
|
* given in byte-offset form, so they do not imply a sector size. The
|
|
|
|
* SBLOCKSEARCH specifies the order in which the locations should be searched.
|
|
|
|
*
|
2004-03-20 18:37:12 +03:00
|
|
|
* Unfortunately the UFS2/FFSv2 change was done without adequate consideration
|
|
|
|
* of backward compatibility. In particular 'newfs' for a FFSv2 partition
|
|
|
|
* must overwrite any old FFSv1 superblock at 8k, and preferrably as many
|
|
|
|
* of the alternates as it can find - otherwise attempting to mount on a
|
|
|
|
* system that only supports FFSv1 is likely to succeed!.
|
|
|
|
* For a small FFSv1 filesystem, an old FFSv2 superblock can be left on
|
|
|
|
* the disk, and a system that tries to find an FFSv2 filesystem in preference
|
|
|
|
* to and FFSv1 one (as NetBSD does) can mount the old FFSv2 filesystem.
|
|
|
|
* As a added bonus, the 'first alternate' superblock of a FFSv1 filesystem
|
|
|
|
* with 64k blocks is at 64k - just where the code looks first when playing
|
|
|
|
* 'hunt the superblock'.
|
2004-03-21 21:48:24 +03:00
|
|
|
*
|
|
|
|
* The ffsv2 superblock layout (which might contain an ffsv1 filesystem)
|
|
|
|
* can be detected by checking for sb->fs_old_flags & FS_FLAGS_UPDATED.
|
2009-02-23 06:01:13 +03:00
|
|
|
* This is the default superblock type for NetBSD since ffsv2 support was added.
|
1994-06-08 15:41:58 +04:00
|
|
|
*/
|
2001-08-30 12:31:25 +04:00
|
|
|
#define BBSIZE 8192
|
1994-06-08 15:41:58 +04:00
|
|
|
#define BBOFF ((off_t)(0))
|
2003-01-25 00:55:02 +03:00
|
|
|
#define BBLOCK ((daddr_t)(0))
|
2003-04-02 14:39:19 +04:00
|
|
|
|
2008-07-31 12:44:21 +04:00
|
|
|
#define SBLOCK_FLOPPY 0
|
|
|
|
#define SBLOCK_UFS1 8192
|
|
|
|
#define SBLOCK_UFS2 65536
|
|
|
|
#define SBLOCK_PIGGY 262144
|
|
|
|
#define SBLOCKSIZE 8192
|
2004-03-20 18:37:12 +03:00
|
|
|
/*
|
2004-03-20 20:26:16 +03:00
|
|
|
* NB: Do not, under any circumstances, look for an ffsv1 filesystem at
|
|
|
|
* SBLOCK_UFS2. Doing so will find the wrong superblock for filesystems
|
|
|
|
* with a 64k block size.
|
2004-03-20 18:37:12 +03:00
|
|
|
*/
|
2008-07-31 12:44:21 +04:00
|
|
|
#define SBLOCKSEARCH \
|
2003-04-02 14:39:19 +04:00
|
|
|
{ SBLOCK_UFS2, SBLOCK_UFS1, SBLOCK_FLOPPY, SBLOCK_PIGGY, -1 }
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Max number of fragments per block. This value is NOT tweakable.
|
|
|
|
*/
|
2008-07-31 12:44:21 +04:00
|
|
|
#define MAXFRAG 8
|
2003-04-02 14:39:19 +04:00
|
|
|
|
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Addresses stored in inodes are capable of addressing fragments
|
2001-08-30 12:31:25 +04:00
|
|
|
* of `blocks'. File system blocks of at most size MAXBSIZE can
|
1994-06-08 15:41:58 +04:00
|
|
|
* be optionally broken into 2, 4, or 8 pieces, each of which is
|
2001-08-30 12:31:25 +04:00
|
|
|
* addressable; these pieces may be DEV_BSIZE, or some multiple of
|
1994-06-08 15:41:58 +04:00
|
|
|
* a DEV_BSIZE unit.
|
|
|
|
*
|
|
|
|
* Large files consist of exclusively large data blocks. To avoid
|
|
|
|
* undue wasted disk space, the last data block of a small file may be
|
|
|
|
* allocated as only as many fragments of a large block as are
|
|
|
|
* necessary. The file system format retains only a single pointer
|
|
|
|
* to such a fragment, which is a piece of a single large block that
|
|
|
|
* has been divided. The size of such a fragment is determinable from
|
|
|
|
* information in the inode, using the ``blksize(fs, ip, lbn)'' macro.
|
|
|
|
*
|
|
|
|
* The file system records space availability at the fragment level;
|
|
|
|
* to determine block availability, aligned fragments are examined.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
1994-12-13 22:10:43 +03:00
|
|
|
* MINBSIZE is the smallest allowable block size.
|
|
|
|
* In order to insure that it is possible to create files of size
|
|
|
|
* 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.
|
|
|
|
* Note that super blocks are always of size SBSIZE,
|
1994-06-08 15:41:58 +04:00
|
|
|
* and that both SBSIZE and MAXBSIZE must be >= MINBSIZE.
|
|
|
|
*/
|
2001-08-30 12:31:25 +04:00
|
|
|
#define MINBSIZE 4096
|
1994-06-08 15:41:58 +04:00
|
|
|
|
|
|
|
/*
|
1994-12-13 22:10:43 +03:00
|
|
|
* The path name on which the file system is mounted is maintained
|
|
|
|
* in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in
|
|
|
|
* the super block for this name.
|
1994-10-20 07:20:55 +03:00
|
|
|
*/
|
2003-04-02 14:39:19 +04:00
|
|
|
#define MAXMNTLEN 468
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The volume name for this filesystem is maintained in fs_volname.
|
|
|
|
* MAXVOLLEN defines the length of the buffer allocated.
|
2004-03-20 20:26:16 +03:00
|
|
|
* This space used to be part of of fs_fsmnt.
|
2003-04-02 14:39:19 +04:00
|
|
|
*/
|
2008-07-31 12:44:21 +04:00
|
|
|
#define MAXVOLLEN 32
|
1994-10-20 07:20:55 +03:00
|
|
|
|
|
|
|
/*
|
2001-09-02 05:58:30 +04:00
|
|
|
* There is a 128-byte region in the superblock reserved for in-core
|
|
|
|
* pointers to summary information. Originally this included an array
|
2003-12-31 21:53:45 +03:00
|
|
|
* of pointers to blocks of struct csum; now there are just four
|
2001-09-02 05:58:30 +04:00
|
|
|
* pointers and the remaining space is padded with fs_ocsp[].
|
|
|
|
* NOCSPTRS determines the size of this padding. One pointer (fs_csp)
|
|
|
|
* is taken away to point to a contiguous array of struct csum for
|
|
|
|
* all cylinder groups; a second (fs_maxcluster) points to an array
|
Incorporate the enhanced ffs_dirpref() by Grigoriy Orlov, as found in
FreeBSD (three commits; the initial work, man page updates, and a fix
to ffs_reload()), with the following differences:
- Be consistent between newfs(8) and tunefs(8) as to the options which
set and control the tuning parameters for this work (avgfilesize & avgfpdir)
- Use u_int16_t instead of u_int8_t to keep track of the number of
contiguous directories (suggested by Chuck Silvers)
- Work within our FFS_EI framework
- Ensure that fs->fs_maxclusters and fs->fs_contigdirs don't point to
the same area of memory
The new algorithm has a marked performance increase, especially when
performing tasks such as untarring pkgsrc.tar.gz, etc.
The original FreeBSD commit messages are attached:
=====
mckusick 2001/04/10 01:39:00 PDT
Directory layout preference improvements from Grigoriy Orlov <gluk@ptci.ru>.
His description of the problem and solution follow. My own tests show
speedups on typical filesystem intensive workloads of 5% to 12% which
is very impressive considering the small amount of code change involved.
------
One day I noticed that some file operations run much faster on
small file systems then on big ones. I've looked at the ffs
algorithms, thought about them, and redesigned the dirpref algorithm.
First I want to describe the results of my tests. These results are old
and I have improved the algorithm after these tests were done. Nevertheless
they show how big the perfomance speedup may be. I have done two file/directory
intensive tests on a two OpenBSD systems with old and new dirpref algorithm.
The first test is "tar -xzf ports.tar.gz", the second is "rm -rf ports".
The ports.tar.gz file is the ports collection from the OpenBSD 2.8 release.
It contains 6596 directories and 13868 files. The test systems are:
1. Celeron-450, 128Mb, two IDE drives, the system at wd0, file system for
test is at wd1. Size of test file system is 8 Gb, number of cg=991,
size of cg is 8m, block size = 8k, fragment size = 1k OpenBSD-current
from Dec 2000 with BUFCACHEPERCENT=35
2. PIII-600, 128Mb, two IBM DTLA-307045 IDE drives at i815e, the system
at wd0, file system for test is at wd1. Size of test file system is 40 Gb,
number of cg=5324, size of cg is 8m, block size = 8k, fragment size = 1k
OpenBSD-current from Dec 2000 with BUFCACHEPERCENT=50
You can get more info about the test systems and methods at:
http://www.ptci.ru/gluk/dirpref/old/dirpref.html
Test Results
tar -xzf ports.tar.gz rm -rf ports
mode old dirpref new dirpref speedup old dirprefnew dirpref speedup
First system
normal 667 472 1.41 477 331 1.44
async 285 144 1.98 130 14 9.29
sync 768 616 1.25 477 334 1.43
softdep 413 252 1.64 241 38 6.34
Second system
normal 329 81 4.06 263.5 93.5 2.81
async 302 25.7 11.75 112 2.26 49.56
sync 281 57.0 4.93 263 90.5 2.9
softdep 341 40.6 8.4 284 4.76 59.66
"old dirpref" and "new dirpref" columns give a test time in seconds.
speedup - speed increasement in times, ie. old dirpref / new dirpref.
------
Algorithm description
The old dirpref algorithm is described in comments:
/*
* Find a cylinder to place a directory.
*
* The policy implemented by this algorithm is to select from
* among those cylinder groups with above the average number of
* free inodes, the one with the smallest number of directories.
*/
A new directory is allocated in a different cylinder groups than its
parent directory resulting in a directory tree that is spreaded across
all the cylinder groups. This spreading out results in a non-optimal
access to the directories and files. When we have a small filesystem
it is not a problem but when the filesystem is big then perfomance
degradation becomes very apparent.
What I mean by a big file system ?
1. A big filesystem is a filesystem which occupy 20-30 or more percent
of total drive space, i.e. first and last cylinder are physically
located relatively far from each other.
2. It has a relatively large number of cylinder groups, for example
more cylinder groups than 50% of the buffers in the buffer cache.
The first results in long access times, while the second results in
many buffers being used by metadata operations. Such operations use
cylinder group blocks and on-disk inode blocks. The cylinder group
block (fs->fs_cblkno) contains struct cg, inode and block bit maps.
It is 2k in size for the default filesystem parameters. If new and
parent directories are located in different cylinder groups then the
system performs more input/output operations and uses more buffers.
On filesystems with many cylinder groups, lots of cache buffers are
used for metadata operations.
My solution for this problem is very simple. I allocate many directories
in one cylinder group. I also do some things, so that the new allocation
method does not cause excessive fragmentation and all directory inodes
will not be located at a location far from its file's inodes and data.
The algorithm is:
/*
* Find a cylinder group to place a directory.
*
* The policy implemented by this algorithm is to allocate a
* directory inode in the same cylinder group as its parent
* directory, but also to reserve space for its files inodes
* and data. Restrict the number of directories which may be
* allocated one after another in the same cylinder group
* without intervening allocation of files.
*
* If we allocate a first level directory then force allocation
* in another cylinder group.
*/
My early versions of dirpref give me a good results for a wide range of
file operations and different filesystem capacities except one case:
those applications that create their entire directory structure first
and only later fill this structure with files.
My solution for such and similar cases is to limit a number of
directories which may be created one after another in the same cylinder
group without intervening file creations. For this purpose, I allocate
an array of counters at mount time. This array is linked to the superblock
fs->fs_contigdirs[cg]. Each time a directory is created the counter
increases and each time a file is created the counter decreases. A 60Gb
filesystem with 8mb/cg requires 10kb of memory for the counters array.
The maxcontigdirs is a maximum number of directories which may be created
without an intervening file creation. I found in my tests that the best
performance occurs when I restrict the number of directories in one cylinder
group such that all its files may be located in the same cylinder group.
There may be some deterioration in performance if all the file inodes
are in the same cylinder group as its containing directory, but their
data partially resides in a different cylinder group. The maxcontigdirs
value is calculated to try to prevent this condition. Since there is
no way to know how many files and directories will be allocated later
I added two optimization parameters in superblock/tunefs. They are:
int32_t fs_avgfilesize; /* expected average file size */
int32_t fs_avgfpdir; /* expected # of files per directory */
These parameters have reasonable defaults but may be tweeked for special
uses of a filesystem. They are only necessary in rare cases like better
tuning a filesystem being used to store a squid cache.
I have been using this algorithm for about 3 months. I have done
a lot of testing on filesystems with different capacities, average
filesize, average number of files per directory, and so on. I think
this algorithm has no negative impact on filesystem perfomance. It
works better than the default one in all cases. The new dirpref
will greatly improve untarring/removing/coping of big directories,
decrease load on cvs servers and much more. The new dirpref doesn't
speedup a compilation process, but also doesn't slow it down.
Obtained from: Grigoriy Orlov <gluk@ptci.ru>
=====
=====
iedowse 2001/04/23 17:37:17 PDT
Pre-dirpref versions of fsck may zero out the new superblock fields
fs_contigdirs, fs_avgfilesize and fs_avgfpdir. This could cause
panics if these fields were zeroed while a filesystem was mounted
read-only, and then remounted read-write.
Add code to ffs_reload() which copies the fs_contigdirs pointer
from the previous superblock, and reinitialises fs_avgf* if necessary.
Reviewed by: mckusick
=====
=====
nik 2001/04/10 03:36:44 PDT
Add information about the new options to newfs and tunefs which set the
expected average file size and number of files per directory. Could do
with some fleshing out.
=====
2001-09-06 06:16:00 +04:00
|
|
|
* of cluster sizes that is computed as cylinder groups are inspected;
|
2003-12-31 21:53:45 +03:00
|
|
|
* the third (fs_contigdirs) points to an array that tracks the
|
|
|
|
* creation of new directories; and the fourth (fs_active) is used
|
|
|
|
* by snapshots.
|
1994-06-08 15:41:58 +04:00
|
|
|
*/
|
2003-04-02 14:39:19 +04:00
|
|
|
#define NOCSPTRS ((128 / sizeof(void *)) - 4)
|
1994-06-08 15:41:58 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* A summary of contiguous blocks of various sizes is maintained
|
|
|
|
* in each cylinder group. Normally this is set by the initial
|
|
|
|
* value of fs_maxcontig. To conserve space, a maximum summary size
|
|
|
|
* is set by FS_MAXCONTIG.
|
|
|
|
*/
|
2001-08-30 12:31:25 +04:00
|
|
|
#define FS_MAXCONTIG 16
|
1994-06-08 15:41:58 +04:00
|
|
|
|
2003-04-02 14:39:19 +04:00
|
|
|
/*
|
2004-05-25 18:54:55 +04:00
|
|
|
* The maximum number of snapshot nodes that can be associated
|
|
|
|
* with each filesystem. This limit affects only the number of
|
|
|
|
* snapshot files that can be recorded within the superblock so
|
|
|
|
* that they can be found when the filesystem is mounted. However,
|
|
|
|
* maintaining too many will slow the filesystem performance, so
|
|
|
|
* having this limit is a good idea.
|
2003-04-02 14:39:19 +04:00
|
|
|
*/
|
2008-07-31 12:44:21 +04:00
|
|
|
#define FSMAXSNAP 20
|
2003-04-02 14:39:19 +04:00
|
|
|
|
2004-05-25 18:54:55 +04:00
|
|
|
/*
|
|
|
|
* Used to identify special blocks in snapshots:
|
|
|
|
*
|
|
|
|
* BLK_NOCOPY - A block that was unallocated at the time the snapshot
|
|
|
|
* was taken, hence does not need to be copied when written.
|
|
|
|
* BLK_SNAP - A block held by another snapshot that is not needed by this
|
|
|
|
* snapshot. When the other snapshot is freed, the BLK_SNAP entries
|
|
|
|
* are converted to BLK_NOCOPY. These are needed to allow fsck to
|
|
|
|
* identify blocks that are in use by other snapshots (which are
|
|
|
|
* expunged from this snapshot).
|
|
|
|
*/
|
2008-07-31 12:44:21 +04:00
|
|
|
#define BLK_NOCOPY ((daddr_t)(1))
|
|
|
|
#define BLK_SNAP ((daddr_t)(2))
|
2004-05-25 18:54:55 +04:00
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
/*
|
|
|
|
* 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 throughput drops by fifty percent if the file system
|
|
|
|
* is run at between 95% and 100% full; thus the minimum default
|
|
|
|
* value of fs_minfree is 5%. However, to get good clustering
|
2007-09-24 20:20:50 +04:00
|
|
|
* performance, 10% is a better choice. This value is used only
|
|
|
|
* when creating a file system and can be overriden from the
|
|
|
|
* command line. By default we choose to optimize for time.
|
1994-06-08 15:41:58 +04:00
|
|
|
*/
|
2001-08-30 12:31:25 +04:00
|
|
|
#define MINFREE 5
|
|
|
|
#define DEFAULTOPT FS_OPTTIME
|
1994-06-08 15:41:58 +04:00
|
|
|
|
Incorporate the enhanced ffs_dirpref() by Grigoriy Orlov, as found in
FreeBSD (three commits; the initial work, man page updates, and a fix
to ffs_reload()), with the following differences:
- Be consistent between newfs(8) and tunefs(8) as to the options which
set and control the tuning parameters for this work (avgfilesize & avgfpdir)
- Use u_int16_t instead of u_int8_t to keep track of the number of
contiguous directories (suggested by Chuck Silvers)
- Work within our FFS_EI framework
- Ensure that fs->fs_maxclusters and fs->fs_contigdirs don't point to
the same area of memory
The new algorithm has a marked performance increase, especially when
performing tasks such as untarring pkgsrc.tar.gz, etc.
The original FreeBSD commit messages are attached:
=====
mckusick 2001/04/10 01:39:00 PDT
Directory layout preference improvements from Grigoriy Orlov <gluk@ptci.ru>.
His description of the problem and solution follow. My own tests show
speedups on typical filesystem intensive workloads of 5% to 12% which
is very impressive considering the small amount of code change involved.
------
One day I noticed that some file operations run much faster on
small file systems then on big ones. I've looked at the ffs
algorithms, thought about them, and redesigned the dirpref algorithm.
First I want to describe the results of my tests. These results are old
and I have improved the algorithm after these tests were done. Nevertheless
they show how big the perfomance speedup may be. I have done two file/directory
intensive tests on a two OpenBSD systems with old and new dirpref algorithm.
The first test is "tar -xzf ports.tar.gz", the second is "rm -rf ports".
The ports.tar.gz file is the ports collection from the OpenBSD 2.8 release.
It contains 6596 directories and 13868 files. The test systems are:
1. Celeron-450, 128Mb, two IDE drives, the system at wd0, file system for
test is at wd1. Size of test file system is 8 Gb, number of cg=991,
size of cg is 8m, block size = 8k, fragment size = 1k OpenBSD-current
from Dec 2000 with BUFCACHEPERCENT=35
2. PIII-600, 128Mb, two IBM DTLA-307045 IDE drives at i815e, the system
at wd0, file system for test is at wd1. Size of test file system is 40 Gb,
number of cg=5324, size of cg is 8m, block size = 8k, fragment size = 1k
OpenBSD-current from Dec 2000 with BUFCACHEPERCENT=50
You can get more info about the test systems and methods at:
http://www.ptci.ru/gluk/dirpref/old/dirpref.html
Test Results
tar -xzf ports.tar.gz rm -rf ports
mode old dirpref new dirpref speedup old dirprefnew dirpref speedup
First system
normal 667 472 1.41 477 331 1.44
async 285 144 1.98 130 14 9.29
sync 768 616 1.25 477 334 1.43
softdep 413 252 1.64 241 38 6.34
Second system
normal 329 81 4.06 263.5 93.5 2.81
async 302 25.7 11.75 112 2.26 49.56
sync 281 57.0 4.93 263 90.5 2.9
softdep 341 40.6 8.4 284 4.76 59.66
"old dirpref" and "new dirpref" columns give a test time in seconds.
speedup - speed increasement in times, ie. old dirpref / new dirpref.
------
Algorithm description
The old dirpref algorithm is described in comments:
/*
* Find a cylinder to place a directory.
*
* The policy implemented by this algorithm is to select from
* among those cylinder groups with above the average number of
* free inodes, the one with the smallest number of directories.
*/
A new directory is allocated in a different cylinder groups than its
parent directory resulting in a directory tree that is spreaded across
all the cylinder groups. This spreading out results in a non-optimal
access to the directories and files. When we have a small filesystem
it is not a problem but when the filesystem is big then perfomance
degradation becomes very apparent.
What I mean by a big file system ?
1. A big filesystem is a filesystem which occupy 20-30 or more percent
of total drive space, i.e. first and last cylinder are physically
located relatively far from each other.
2. It has a relatively large number of cylinder groups, for example
more cylinder groups than 50% of the buffers in the buffer cache.
The first results in long access times, while the second results in
many buffers being used by metadata operations. Such operations use
cylinder group blocks and on-disk inode blocks. The cylinder group
block (fs->fs_cblkno) contains struct cg, inode and block bit maps.
It is 2k in size for the default filesystem parameters. If new and
parent directories are located in different cylinder groups then the
system performs more input/output operations and uses more buffers.
On filesystems with many cylinder groups, lots of cache buffers are
used for metadata operations.
My solution for this problem is very simple. I allocate many directories
in one cylinder group. I also do some things, so that the new allocation
method does not cause excessive fragmentation and all directory inodes
will not be located at a location far from its file's inodes and data.
The algorithm is:
/*
* Find a cylinder group to place a directory.
*
* The policy implemented by this algorithm is to allocate a
* directory inode in the same cylinder group as its parent
* directory, but also to reserve space for its files inodes
* and data. Restrict the number of directories which may be
* allocated one after another in the same cylinder group
* without intervening allocation of files.
*
* If we allocate a first level directory then force allocation
* in another cylinder group.
*/
My early versions of dirpref give me a good results for a wide range of
file operations and different filesystem capacities except one case:
those applications that create their entire directory structure first
and only later fill this structure with files.
My solution for such and similar cases is to limit a number of
directories which may be created one after another in the same cylinder
group without intervening file creations. For this purpose, I allocate
an array of counters at mount time. This array is linked to the superblock
fs->fs_contigdirs[cg]. Each time a directory is created the counter
increases and each time a file is created the counter decreases. A 60Gb
filesystem with 8mb/cg requires 10kb of memory for the counters array.
The maxcontigdirs is a maximum number of directories which may be created
without an intervening file creation. I found in my tests that the best
performance occurs when I restrict the number of directories in one cylinder
group such that all its files may be located in the same cylinder group.
There may be some deterioration in performance if all the file inodes
are in the same cylinder group as its containing directory, but their
data partially resides in a different cylinder group. The maxcontigdirs
value is calculated to try to prevent this condition. Since there is
no way to know how many files and directories will be allocated later
I added two optimization parameters in superblock/tunefs. They are:
int32_t fs_avgfilesize; /* expected average file size */
int32_t fs_avgfpdir; /* expected # of files per directory */
These parameters have reasonable defaults but may be tweeked for special
uses of a filesystem. They are only necessary in rare cases like better
tuning a filesystem being used to store a squid cache.
I have been using this algorithm for about 3 months. I have done
a lot of testing on filesystems with different capacities, average
filesize, average number of files per directory, and so on. I think
this algorithm has no negative impact on filesystem perfomance. It
works better than the default one in all cases. The new dirpref
will greatly improve untarring/removing/coping of big directories,
decrease load on cvs servers and much more. The new dirpref doesn't
speedup a compilation process, but also doesn't slow it down.
Obtained from: Grigoriy Orlov <gluk@ptci.ru>
=====
=====
iedowse 2001/04/23 17:37:17 PDT
Pre-dirpref versions of fsck may zero out the new superblock fields
fs_contigdirs, fs_avgfilesize and fs_avgfpdir. This could cause
panics if these fields were zeroed while a filesystem was mounted
read-only, and then remounted read-write.
Add code to ffs_reload() which copies the fs_contigdirs pointer
from the previous superblock, and reinitialises fs_avgf* if necessary.
Reviewed by: mckusick
=====
=====
nik 2001/04/10 03:36:44 PDT
Add information about the new options to newfs and tunefs which set the
expected average file size and number of files per directory. Could do
with some fleshing out.
=====
2001-09-06 06:16:00 +04:00
|
|
|
/*
|
|
|
|
* Grigoriy Orlov <gluk@ptci.ru> has done some extensive work to fine
|
|
|
|
* tune the layout preferences for directories within a filesystem.
|
|
|
|
* His algorithm can be tuned by adjusting the following parameters
|
|
|
|
* which tell the system the average file size and the average number
|
|
|
|
* of files per directory. These defaults are well selected for typical
|
|
|
|
* filesystems, but may need to be tuned for odd cases like filesystems
|
2002-11-04 19:59:37 +03:00
|
|
|
* being used for squid caches or news spools.
|
Incorporate the enhanced ffs_dirpref() by Grigoriy Orlov, as found in
FreeBSD (three commits; the initial work, man page updates, and a fix
to ffs_reload()), with the following differences:
- Be consistent between newfs(8) and tunefs(8) as to the options which
set and control the tuning parameters for this work (avgfilesize & avgfpdir)
- Use u_int16_t instead of u_int8_t to keep track of the number of
contiguous directories (suggested by Chuck Silvers)
- Work within our FFS_EI framework
- Ensure that fs->fs_maxclusters and fs->fs_contigdirs don't point to
the same area of memory
The new algorithm has a marked performance increase, especially when
performing tasks such as untarring pkgsrc.tar.gz, etc.
The original FreeBSD commit messages are attached:
=====
mckusick 2001/04/10 01:39:00 PDT
Directory layout preference improvements from Grigoriy Orlov <gluk@ptci.ru>.
His description of the problem and solution follow. My own tests show
speedups on typical filesystem intensive workloads of 5% to 12% which
is very impressive considering the small amount of code change involved.
------
One day I noticed that some file operations run much faster on
small file systems then on big ones. I've looked at the ffs
algorithms, thought about them, and redesigned the dirpref algorithm.
First I want to describe the results of my tests. These results are old
and I have improved the algorithm after these tests were done. Nevertheless
they show how big the perfomance speedup may be. I have done two file/directory
intensive tests on a two OpenBSD systems with old and new dirpref algorithm.
The first test is "tar -xzf ports.tar.gz", the second is "rm -rf ports".
The ports.tar.gz file is the ports collection from the OpenBSD 2.8 release.
It contains 6596 directories and 13868 files. The test systems are:
1. Celeron-450, 128Mb, two IDE drives, the system at wd0, file system for
test is at wd1. Size of test file system is 8 Gb, number of cg=991,
size of cg is 8m, block size = 8k, fragment size = 1k OpenBSD-current
from Dec 2000 with BUFCACHEPERCENT=35
2. PIII-600, 128Mb, two IBM DTLA-307045 IDE drives at i815e, the system
at wd0, file system for test is at wd1. Size of test file system is 40 Gb,
number of cg=5324, size of cg is 8m, block size = 8k, fragment size = 1k
OpenBSD-current from Dec 2000 with BUFCACHEPERCENT=50
You can get more info about the test systems and methods at:
http://www.ptci.ru/gluk/dirpref/old/dirpref.html
Test Results
tar -xzf ports.tar.gz rm -rf ports
mode old dirpref new dirpref speedup old dirprefnew dirpref speedup
First system
normal 667 472 1.41 477 331 1.44
async 285 144 1.98 130 14 9.29
sync 768 616 1.25 477 334 1.43
softdep 413 252 1.64 241 38 6.34
Second system
normal 329 81 4.06 263.5 93.5 2.81
async 302 25.7 11.75 112 2.26 49.56
sync 281 57.0 4.93 263 90.5 2.9
softdep 341 40.6 8.4 284 4.76 59.66
"old dirpref" and "new dirpref" columns give a test time in seconds.
speedup - speed increasement in times, ie. old dirpref / new dirpref.
------
Algorithm description
The old dirpref algorithm is described in comments:
/*
* Find a cylinder to place a directory.
*
* The policy implemented by this algorithm is to select from
* among those cylinder groups with above the average number of
* free inodes, the one with the smallest number of directories.
*/
A new directory is allocated in a different cylinder groups than its
parent directory resulting in a directory tree that is spreaded across
all the cylinder groups. This spreading out results in a non-optimal
access to the directories and files. When we have a small filesystem
it is not a problem but when the filesystem is big then perfomance
degradation becomes very apparent.
What I mean by a big file system ?
1. A big filesystem is a filesystem which occupy 20-30 or more percent
of total drive space, i.e. first and last cylinder are physically
located relatively far from each other.
2. It has a relatively large number of cylinder groups, for example
more cylinder groups than 50% of the buffers in the buffer cache.
The first results in long access times, while the second results in
many buffers being used by metadata operations. Such operations use
cylinder group blocks and on-disk inode blocks. The cylinder group
block (fs->fs_cblkno) contains struct cg, inode and block bit maps.
It is 2k in size for the default filesystem parameters. If new and
parent directories are located in different cylinder groups then the
system performs more input/output operations and uses more buffers.
On filesystems with many cylinder groups, lots of cache buffers are
used for metadata operations.
My solution for this problem is very simple. I allocate many directories
in one cylinder group. I also do some things, so that the new allocation
method does not cause excessive fragmentation and all directory inodes
will not be located at a location far from its file's inodes and data.
The algorithm is:
/*
* Find a cylinder group to place a directory.
*
* The policy implemented by this algorithm is to allocate a
* directory inode in the same cylinder group as its parent
* directory, but also to reserve space for its files inodes
* and data. Restrict the number of directories which may be
* allocated one after another in the same cylinder group
* without intervening allocation of files.
*
* If we allocate a first level directory then force allocation
* in another cylinder group.
*/
My early versions of dirpref give me a good results for a wide range of
file operations and different filesystem capacities except one case:
those applications that create their entire directory structure first
and only later fill this structure with files.
My solution for such and similar cases is to limit a number of
directories which may be created one after another in the same cylinder
group without intervening file creations. For this purpose, I allocate
an array of counters at mount time. This array is linked to the superblock
fs->fs_contigdirs[cg]. Each time a directory is created the counter
increases and each time a file is created the counter decreases. A 60Gb
filesystem with 8mb/cg requires 10kb of memory for the counters array.
The maxcontigdirs is a maximum number of directories which may be created
without an intervening file creation. I found in my tests that the best
performance occurs when I restrict the number of directories in one cylinder
group such that all its files may be located in the same cylinder group.
There may be some deterioration in performance if all the file inodes
are in the same cylinder group as its containing directory, but their
data partially resides in a different cylinder group. The maxcontigdirs
value is calculated to try to prevent this condition. Since there is
no way to know how many files and directories will be allocated later
I added two optimization parameters in superblock/tunefs. They are:
int32_t fs_avgfilesize; /* expected average file size */
int32_t fs_avgfpdir; /* expected # of files per directory */
These parameters have reasonable defaults but may be tweeked for special
uses of a filesystem. They are only necessary in rare cases like better
tuning a filesystem being used to store a squid cache.
I have been using this algorithm for about 3 months. I have done
a lot of testing on filesystems with different capacities, average
filesize, average number of files per directory, and so on. I think
this algorithm has no negative impact on filesystem perfomance. It
works better than the default one in all cases. The new dirpref
will greatly improve untarring/removing/coping of big directories,
decrease load on cvs servers and much more. The new dirpref doesn't
speedup a compilation process, but also doesn't slow it down.
Obtained from: Grigoriy Orlov <gluk@ptci.ru>
=====
=====
iedowse 2001/04/23 17:37:17 PDT
Pre-dirpref versions of fsck may zero out the new superblock fields
fs_contigdirs, fs_avgfilesize and fs_avgfpdir. This could cause
panics if these fields were zeroed while a filesystem was mounted
read-only, and then remounted read-write.
Add code to ffs_reload() which copies the fs_contigdirs pointer
from the previous superblock, and reinitialises fs_avgf* if necessary.
Reviewed by: mckusick
=====
=====
nik 2001/04/10 03:36:44 PDT
Add information about the new options to newfs and tunefs which set the
expected average file size and number of files per directory. Could do
with some fleshing out.
=====
2001-09-06 06:16:00 +04:00
|
|
|
*/
|
|
|
|
#define AVFILESIZ 16384 /* expected average file size */
|
|
|
|
#define AFPDIR 64 /* expected number of files per directory */
|
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
/*
|
|
|
|
* Per cylinder group information; summarized in blocks allocated
|
|
|
|
* from first cylinder group data blocks. These blocks have to be
|
|
|
|
* read in from fs_csaddr (size fs_cssize) in addition to the
|
|
|
|
* super block.
|
|
|
|
*/
|
|
|
|
struct csum {
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t cs_ndir; /* number of directories */
|
|
|
|
int32_t cs_nbfree; /* number of free blocks */
|
|
|
|
int32_t cs_nifree; /* number of free inodes */
|
|
|
|
int32_t cs_nffree; /* number of free frags */
|
1994-06-08 15:41:58 +04:00
|
|
|
};
|
|
|
|
|
2003-04-02 14:39:19 +04:00
|
|
|
struct csum_total {
|
|
|
|
int64_t cs_ndir; /* number of directories */
|
|
|
|
int64_t cs_nbfree; /* number of free blocks */
|
|
|
|
int64_t cs_nifree; /* number of free inodes */
|
|
|
|
int64_t cs_nffree; /* number of free frags */
|
2003-12-31 22:19:39 +03:00
|
|
|
int64_t cs_spare[4]; /* future expansion */
|
2003-04-02 14:39:19 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
/*
|
1998-03-18 18:57:26 +03:00
|
|
|
* Super block for an FFS file system in memory.
|
1994-06-08 15:41:58 +04:00
|
|
|
*/
|
|
|
|
struct fs {
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_firstfield; /* historic file system linked list, */
|
|
|
|
int32_t fs_unused_1; /* used for incore super blocks */
|
2003-01-25 00:55:02 +03:00
|
|
|
int32_t fs_sblkno; /* addr of super-block in filesys */
|
|
|
|
int32_t fs_cblkno; /* offset of cyl-block in filesys */
|
|
|
|
int32_t fs_iblkno; /* offset of inode-blocks in filesys */
|
|
|
|
int32_t fs_dblkno; /* offset of first data after cg */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_old_cgoffset; /* cylinder group offset in cylinder */
|
|
|
|
int32_t fs_old_cgmask; /* used to calc mod fs_ntrak */
|
|
|
|
int32_t fs_old_time; /* last time written */
|
|
|
|
int32_t fs_old_size; /* number of blocks in fs */
|
|
|
|
int32_t fs_old_dsize; /* number of data blocks in fs */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_ncg; /* number of cylinder groups */
|
|
|
|
int32_t fs_bsize; /* size of basic blocks in fs */
|
|
|
|
int32_t fs_fsize; /* size of frag blocks in fs */
|
|
|
|
int32_t fs_frag; /* number of frags in a block in fs */
|
1994-06-08 15:41:58 +04:00
|
|
|
/* these are configuration parameters */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_minfree; /* minimum percentage of free blocks */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_old_rotdelay; /* num of ms for optimal next block */
|
|
|
|
int32_t fs_old_rps; /* disk revolutions per second */
|
1994-06-08 15:41:58 +04:00
|
|
|
/* these fields can be computed from the others */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_bmask; /* ``blkoff'' calc of blk offsets */
|
|
|
|
int32_t fs_fmask; /* ``fragoff'' calc of frag offsets */
|
|
|
|
int32_t fs_bshift; /* ``lblkno'' calc of logical blkno */
|
|
|
|
int32_t fs_fshift; /* ``numfrags'' calc number of frags */
|
1994-06-08 15:41:58 +04:00
|
|
|
/* these are configuration parameters */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_maxcontig; /* max number of contiguous blks */
|
|
|
|
int32_t fs_maxbpg; /* max number of blks per cyl group */
|
1994-06-08 15:41:58 +04:00
|
|
|
/* these fields can be computed from the others */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_fragshift; /* block to frag shift */
|
|
|
|
int32_t fs_fsbtodb; /* fsbtodb and dbtofsb shift constant */
|
|
|
|
int32_t fs_sbsize; /* actual size of super block */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_spare1[2]; /* old fs_csmask */
|
|
|
|
/* old fs_csshift */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_nindir; /* value of NINDIR */
|
|
|
|
int32_t fs_inopb; /* value of INOPB */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_old_nspf; /* value of NSPF */
|
1994-06-08 15:41:58 +04:00
|
|
|
/* yet another configuration parameter */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_optim; /* optimization preference, see below */
|
1994-06-08 15:41:58 +04:00
|
|
|
/* these fields are derived from the hardware */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_old_npsect; /* # sectors/track including spares */
|
|
|
|
int32_t fs_old_interleave; /* hardware sector interleave */
|
|
|
|
int32_t fs_old_trackskew; /* sector 0 skew, per track */
|
2001-08-30 18:37:25 +04:00
|
|
|
/* fs_id takes the space of the unused fs_headswitch and fs_trkseek fields */
|
|
|
|
int32_t fs_id[2]; /* unique file system id */
|
1994-06-08 15:41:58 +04:00
|
|
|
/* sizes determined by number of cylinder groups and their sizes */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_old_csaddr; /* blk addr of cyl grp summary area */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_cssize; /* size of cyl grp summary area */
|
|
|
|
int32_t fs_cgsize; /* cylinder group size */
|
1994-06-08 15:41:58 +04:00
|
|
|
/* these fields are derived from the hardware */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_spare2; /* old fs_ntrak */
|
|
|
|
int32_t fs_old_nsect; /* sectors per track */
|
|
|
|
int32_t fs_old_spc; /* sectors per cylinder */
|
|
|
|
int32_t fs_old_ncyl; /* cylinders in file system */
|
|
|
|
int32_t fs_old_cpg; /* cylinders per group */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_ipg; /* inodes per group */
|
|
|
|
int32_t fs_fpg; /* blocks per group * fs_frag */
|
1994-06-08 15:41:58 +04:00
|
|
|
/* this data must be re-computed after crashes */
|
2003-04-02 14:39:19 +04:00
|
|
|
struct csum fs_old_cstotal; /* cylinder summary information */
|
1994-06-08 15:41:58 +04:00
|
|
|
/* these fields are cleared at mount time */
|
1994-12-13 22:10:43 +03:00
|
|
|
int8_t fs_fmod; /* super block modified flag */
|
2007-11-23 21:00:46 +03:00
|
|
|
uint8_t fs_clean; /* file system is clean flag */
|
1994-12-13 22:10:43 +03:00
|
|
|
int8_t fs_ronly; /* mounted read-only flag */
|
2003-09-30 00:34:23 +04:00
|
|
|
uint8_t fs_old_flags; /* see FS_ flags below */
|
1994-12-13 22:10:43 +03:00
|
|
|
u_char fs_fsmnt[MAXMNTLEN]; /* name mounted on */
|
2003-04-02 14:39:19 +04:00
|
|
|
u_char fs_volname[MAXVOLLEN]; /* volume name */
|
|
|
|
uint64_t fs_swuid; /* system-wide uid */
|
|
|
|
int32_t fs_pad;
|
1994-06-08 15:41:58 +04:00
|
|
|
/* these fields retain the current block allocation info */
|
2001-09-19 05:38:16 +04:00
|
|
|
int32_t fs_cgrotor; /* last cg searched (UNUSED) */
|
2001-09-02 05:58:30 +04:00
|
|
|
void *fs_ocsp[NOCSPTRS]; /* padding; was list of fs_cs buffers */
|
2003-04-02 14:39:19 +04:00
|
|
|
u_int8_t *fs_contigdirs; /* # of contiguously allocated dirs */
|
2001-09-02 05:58:30 +04:00
|
|
|
struct csum *fs_csp; /* cg summary info buffer for fs_cs */
|
Incorporate the enhanced ffs_dirpref() by Grigoriy Orlov, as found in
FreeBSD (three commits; the initial work, man page updates, and a fix
to ffs_reload()), with the following differences:
- Be consistent between newfs(8) and tunefs(8) as to the options which
set and control the tuning parameters for this work (avgfilesize & avgfpdir)
- Use u_int16_t instead of u_int8_t to keep track of the number of
contiguous directories (suggested by Chuck Silvers)
- Work within our FFS_EI framework
- Ensure that fs->fs_maxclusters and fs->fs_contigdirs don't point to
the same area of memory
The new algorithm has a marked performance increase, especially when
performing tasks such as untarring pkgsrc.tar.gz, etc.
The original FreeBSD commit messages are attached:
=====
mckusick 2001/04/10 01:39:00 PDT
Directory layout preference improvements from Grigoriy Orlov <gluk@ptci.ru>.
His description of the problem and solution follow. My own tests show
speedups on typical filesystem intensive workloads of 5% to 12% which
is very impressive considering the small amount of code change involved.
------
One day I noticed that some file operations run much faster on
small file systems then on big ones. I've looked at the ffs
algorithms, thought about them, and redesigned the dirpref algorithm.
First I want to describe the results of my tests. These results are old
and I have improved the algorithm after these tests were done. Nevertheless
they show how big the perfomance speedup may be. I have done two file/directory
intensive tests on a two OpenBSD systems with old and new dirpref algorithm.
The first test is "tar -xzf ports.tar.gz", the second is "rm -rf ports".
The ports.tar.gz file is the ports collection from the OpenBSD 2.8 release.
It contains 6596 directories and 13868 files. The test systems are:
1. Celeron-450, 128Mb, two IDE drives, the system at wd0, file system for
test is at wd1. Size of test file system is 8 Gb, number of cg=991,
size of cg is 8m, block size = 8k, fragment size = 1k OpenBSD-current
from Dec 2000 with BUFCACHEPERCENT=35
2. PIII-600, 128Mb, two IBM DTLA-307045 IDE drives at i815e, the system
at wd0, file system for test is at wd1. Size of test file system is 40 Gb,
number of cg=5324, size of cg is 8m, block size = 8k, fragment size = 1k
OpenBSD-current from Dec 2000 with BUFCACHEPERCENT=50
You can get more info about the test systems and methods at:
http://www.ptci.ru/gluk/dirpref/old/dirpref.html
Test Results
tar -xzf ports.tar.gz rm -rf ports
mode old dirpref new dirpref speedup old dirprefnew dirpref speedup
First system
normal 667 472 1.41 477 331 1.44
async 285 144 1.98 130 14 9.29
sync 768 616 1.25 477 334 1.43
softdep 413 252 1.64 241 38 6.34
Second system
normal 329 81 4.06 263.5 93.5 2.81
async 302 25.7 11.75 112 2.26 49.56
sync 281 57.0 4.93 263 90.5 2.9
softdep 341 40.6 8.4 284 4.76 59.66
"old dirpref" and "new dirpref" columns give a test time in seconds.
speedup - speed increasement in times, ie. old dirpref / new dirpref.
------
Algorithm description
The old dirpref algorithm is described in comments:
/*
* Find a cylinder to place a directory.
*
* The policy implemented by this algorithm is to select from
* among those cylinder groups with above the average number of
* free inodes, the one with the smallest number of directories.
*/
A new directory is allocated in a different cylinder groups than its
parent directory resulting in a directory tree that is spreaded across
all the cylinder groups. This spreading out results in a non-optimal
access to the directories and files. When we have a small filesystem
it is not a problem but when the filesystem is big then perfomance
degradation becomes very apparent.
What I mean by a big file system ?
1. A big filesystem is a filesystem which occupy 20-30 or more percent
of total drive space, i.e. first and last cylinder are physically
located relatively far from each other.
2. It has a relatively large number of cylinder groups, for example
more cylinder groups than 50% of the buffers in the buffer cache.
The first results in long access times, while the second results in
many buffers being used by metadata operations. Such operations use
cylinder group blocks and on-disk inode blocks. The cylinder group
block (fs->fs_cblkno) contains struct cg, inode and block bit maps.
It is 2k in size for the default filesystem parameters. If new and
parent directories are located in different cylinder groups then the
system performs more input/output operations and uses more buffers.
On filesystems with many cylinder groups, lots of cache buffers are
used for metadata operations.
My solution for this problem is very simple. I allocate many directories
in one cylinder group. I also do some things, so that the new allocation
method does not cause excessive fragmentation and all directory inodes
will not be located at a location far from its file's inodes and data.
The algorithm is:
/*
* Find a cylinder group to place a directory.
*
* The policy implemented by this algorithm is to allocate a
* directory inode in the same cylinder group as its parent
* directory, but also to reserve space for its files inodes
* and data. Restrict the number of directories which may be
* allocated one after another in the same cylinder group
* without intervening allocation of files.
*
* If we allocate a first level directory then force allocation
* in another cylinder group.
*/
My early versions of dirpref give me a good results for a wide range of
file operations and different filesystem capacities except one case:
those applications that create their entire directory structure first
and only later fill this structure with files.
My solution for such and similar cases is to limit a number of
directories which may be created one after another in the same cylinder
group without intervening file creations. For this purpose, I allocate
an array of counters at mount time. This array is linked to the superblock
fs->fs_contigdirs[cg]. Each time a directory is created the counter
increases and each time a file is created the counter decreases. A 60Gb
filesystem with 8mb/cg requires 10kb of memory for the counters array.
The maxcontigdirs is a maximum number of directories which may be created
without an intervening file creation. I found in my tests that the best
performance occurs when I restrict the number of directories in one cylinder
group such that all its files may be located in the same cylinder group.
There may be some deterioration in performance if all the file inodes
are in the same cylinder group as its containing directory, but their
data partially resides in a different cylinder group. The maxcontigdirs
value is calculated to try to prevent this condition. Since there is
no way to know how many files and directories will be allocated later
I added two optimization parameters in superblock/tunefs. They are:
int32_t fs_avgfilesize; /* expected average file size */
int32_t fs_avgfpdir; /* expected # of files per directory */
These parameters have reasonable defaults but may be tweeked for special
uses of a filesystem. They are only necessary in rare cases like better
tuning a filesystem being used to store a squid cache.
I have been using this algorithm for about 3 months. I have done
a lot of testing on filesystems with different capacities, average
filesize, average number of files per directory, and so on. I think
this algorithm has no negative impact on filesystem perfomance. It
works better than the default one in all cases. The new dirpref
will greatly improve untarring/removing/coping of big directories,
decrease load on cvs servers and much more. The new dirpref doesn't
speedup a compilation process, but also doesn't slow it down.
Obtained from: Grigoriy Orlov <gluk@ptci.ru>
=====
=====
iedowse 2001/04/23 17:37:17 PDT
Pre-dirpref versions of fsck may zero out the new superblock fields
fs_contigdirs, fs_avgfilesize and fs_avgfpdir. This could cause
panics if these fields were zeroed while a filesystem was mounted
read-only, and then remounted read-write.
Add code to ffs_reload() which copies the fs_contigdirs pointer
from the previous superblock, and reinitialises fs_avgf* if necessary.
Reviewed by: mckusick
=====
=====
nik 2001/04/10 03:36:44 PDT
Add information about the new options to newfs and tunefs which set the
expected average file size and number of files per directory. Could do
with some fleshing out.
=====
2001-09-06 06:16:00 +04:00
|
|
|
int32_t *fs_maxcluster; /* max cluster in each cyl group */
|
2004-05-25 18:54:55 +04:00
|
|
|
u_char *fs_active; /* used by snapshots to track fs */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_old_cpc; /* cyl per cycle in postbl */
|
2004-03-21 21:48:24 +03:00
|
|
|
/* this area is otherwise allocated unless fs_old_flags & FS_FLAGS_UPDATED */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_maxbsize; /* maximum blocking factor permitted */
|
2008-07-31 09:38:04 +04:00
|
|
|
uint8_t fs_journal_version; /* journal format version */
|
|
|
|
uint8_t fs_journal_location; /* journal location type */
|
|
|
|
uint8_t fs_journal_reserved[2];/* reserved for future use */
|
|
|
|
uint32_t fs_journal_flags; /* journal flags */
|
|
|
|
uint64_t fs_journallocs[4]; /* location info for journal */
|
|
|
|
int64_t fs_sparecon64[12]; /* reserved for future use */
|
2003-04-02 14:39:19 +04:00
|
|
|
int64_t fs_sblockloc; /* byte offset of standard superblock */
|
|
|
|
struct csum_total fs_cstotal; /* cylinder summary information */
|
2003-08-21 18:41:00 +04:00
|
|
|
int64_t fs_time; /* last time written */
|
2003-04-02 14:39:19 +04:00
|
|
|
int64_t fs_size; /* number of blocks in fs */
|
|
|
|
int64_t fs_dsize; /* number of data blocks in fs */
|
|
|
|
int64_t fs_csaddr; /* blk addr of cyl grp summary area */
|
|
|
|
int64_t fs_pendingblocks; /* blocks in process of being freed */
|
|
|
|
int32_t fs_pendinginodes; /* inodes in process of being freed */
|
|
|
|
int32_t fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */
|
2004-03-20 20:26:16 +03:00
|
|
|
/* back to stuff that has been around a while */
|
Incorporate the enhanced ffs_dirpref() by Grigoriy Orlov, as found in
FreeBSD (three commits; the initial work, man page updates, and a fix
to ffs_reload()), with the following differences:
- Be consistent between newfs(8) and tunefs(8) as to the options which
set and control the tuning parameters for this work (avgfilesize & avgfpdir)
- Use u_int16_t instead of u_int8_t to keep track of the number of
contiguous directories (suggested by Chuck Silvers)
- Work within our FFS_EI framework
- Ensure that fs->fs_maxclusters and fs->fs_contigdirs don't point to
the same area of memory
The new algorithm has a marked performance increase, especially when
performing tasks such as untarring pkgsrc.tar.gz, etc.
The original FreeBSD commit messages are attached:
=====
mckusick 2001/04/10 01:39:00 PDT
Directory layout preference improvements from Grigoriy Orlov <gluk@ptci.ru>.
His description of the problem and solution follow. My own tests show
speedups on typical filesystem intensive workloads of 5% to 12% which
is very impressive considering the small amount of code change involved.
------
One day I noticed that some file operations run much faster on
small file systems then on big ones. I've looked at the ffs
algorithms, thought about them, and redesigned the dirpref algorithm.
First I want to describe the results of my tests. These results are old
and I have improved the algorithm after these tests were done. Nevertheless
they show how big the perfomance speedup may be. I have done two file/directory
intensive tests on a two OpenBSD systems with old and new dirpref algorithm.
The first test is "tar -xzf ports.tar.gz", the second is "rm -rf ports".
The ports.tar.gz file is the ports collection from the OpenBSD 2.8 release.
It contains 6596 directories and 13868 files. The test systems are:
1. Celeron-450, 128Mb, two IDE drives, the system at wd0, file system for
test is at wd1. Size of test file system is 8 Gb, number of cg=991,
size of cg is 8m, block size = 8k, fragment size = 1k OpenBSD-current
from Dec 2000 with BUFCACHEPERCENT=35
2. PIII-600, 128Mb, two IBM DTLA-307045 IDE drives at i815e, the system
at wd0, file system for test is at wd1. Size of test file system is 40 Gb,
number of cg=5324, size of cg is 8m, block size = 8k, fragment size = 1k
OpenBSD-current from Dec 2000 with BUFCACHEPERCENT=50
You can get more info about the test systems and methods at:
http://www.ptci.ru/gluk/dirpref/old/dirpref.html
Test Results
tar -xzf ports.tar.gz rm -rf ports
mode old dirpref new dirpref speedup old dirprefnew dirpref speedup
First system
normal 667 472 1.41 477 331 1.44
async 285 144 1.98 130 14 9.29
sync 768 616 1.25 477 334 1.43
softdep 413 252 1.64 241 38 6.34
Second system
normal 329 81 4.06 263.5 93.5 2.81
async 302 25.7 11.75 112 2.26 49.56
sync 281 57.0 4.93 263 90.5 2.9
softdep 341 40.6 8.4 284 4.76 59.66
"old dirpref" and "new dirpref" columns give a test time in seconds.
speedup - speed increasement in times, ie. old dirpref / new dirpref.
------
Algorithm description
The old dirpref algorithm is described in comments:
/*
* Find a cylinder to place a directory.
*
* The policy implemented by this algorithm is to select from
* among those cylinder groups with above the average number of
* free inodes, the one with the smallest number of directories.
*/
A new directory is allocated in a different cylinder groups than its
parent directory resulting in a directory tree that is spreaded across
all the cylinder groups. This spreading out results in a non-optimal
access to the directories and files. When we have a small filesystem
it is not a problem but when the filesystem is big then perfomance
degradation becomes very apparent.
What I mean by a big file system ?
1. A big filesystem is a filesystem which occupy 20-30 or more percent
of total drive space, i.e. first and last cylinder are physically
located relatively far from each other.
2. It has a relatively large number of cylinder groups, for example
more cylinder groups than 50% of the buffers in the buffer cache.
The first results in long access times, while the second results in
many buffers being used by metadata operations. Such operations use
cylinder group blocks and on-disk inode blocks. The cylinder group
block (fs->fs_cblkno) contains struct cg, inode and block bit maps.
It is 2k in size for the default filesystem parameters. If new and
parent directories are located in different cylinder groups then the
system performs more input/output operations and uses more buffers.
On filesystems with many cylinder groups, lots of cache buffers are
used for metadata operations.
My solution for this problem is very simple. I allocate many directories
in one cylinder group. I also do some things, so that the new allocation
method does not cause excessive fragmentation and all directory inodes
will not be located at a location far from its file's inodes and data.
The algorithm is:
/*
* Find a cylinder group to place a directory.
*
* The policy implemented by this algorithm is to allocate a
* directory inode in the same cylinder group as its parent
* directory, but also to reserve space for its files inodes
* and data. Restrict the number of directories which may be
* allocated one after another in the same cylinder group
* without intervening allocation of files.
*
* If we allocate a first level directory then force allocation
* in another cylinder group.
*/
My early versions of dirpref give me a good results for a wide range of
file operations and different filesystem capacities except one case:
those applications that create their entire directory structure first
and only later fill this structure with files.
My solution for such and similar cases is to limit a number of
directories which may be created one after another in the same cylinder
group without intervening file creations. For this purpose, I allocate
an array of counters at mount time. This array is linked to the superblock
fs->fs_contigdirs[cg]. Each time a directory is created the counter
increases and each time a file is created the counter decreases. A 60Gb
filesystem with 8mb/cg requires 10kb of memory for the counters array.
The maxcontigdirs is a maximum number of directories which may be created
without an intervening file creation. I found in my tests that the best
performance occurs when I restrict the number of directories in one cylinder
group such that all its files may be located in the same cylinder group.
There may be some deterioration in performance if all the file inodes
are in the same cylinder group as its containing directory, but their
data partially resides in a different cylinder group. The maxcontigdirs
value is calculated to try to prevent this condition. Since there is
no way to know how many files and directories will be allocated later
I added two optimization parameters in superblock/tunefs. They are:
int32_t fs_avgfilesize; /* expected average file size */
int32_t fs_avgfpdir; /* expected # of files per directory */
These parameters have reasonable defaults but may be tweeked for special
uses of a filesystem. They are only necessary in rare cases like better
tuning a filesystem being used to store a squid cache.
I have been using this algorithm for about 3 months. I have done
a lot of testing on filesystems with different capacities, average
filesize, average number of files per directory, and so on. I think
this algorithm has no negative impact on filesystem perfomance. It
works better than the default one in all cases. The new dirpref
will greatly improve untarring/removing/coping of big directories,
decrease load on cvs servers and much more. The new dirpref doesn't
speedup a compilation process, but also doesn't slow it down.
Obtained from: Grigoriy Orlov <gluk@ptci.ru>
=====
=====
iedowse 2001/04/23 17:37:17 PDT
Pre-dirpref versions of fsck may zero out the new superblock fields
fs_contigdirs, fs_avgfilesize and fs_avgfpdir. This could cause
panics if these fields were zeroed while a filesystem was mounted
read-only, and then remounted read-write.
Add code to ffs_reload() which copies the fs_contigdirs pointer
from the previous superblock, and reinitialises fs_avgf* if necessary.
Reviewed by: mckusick
=====
=====
nik 2001/04/10 03:36:44 PDT
Add information about the new options to newfs and tunefs which set the
expected average file size and number of files per directory. Could do
with some fleshing out.
=====
2001-09-06 06:16:00 +04:00
|
|
|
int32_t fs_avgfilesize; /* expected average file size */
|
|
|
|
int32_t fs_avgfpdir; /* expected # of files per directory */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_save_cgsize; /* save real cg size to use fs_bsize */
|
|
|
|
int32_t fs_sparecon32[26]; /* reserved for future constants */
|
2003-09-30 00:34:23 +04:00
|
|
|
uint32_t fs_flags; /* see FS_ flags below */
|
2004-03-20 20:26:16 +03:00
|
|
|
/* back to stuff that has been around a while (again) */
|
2005-02-27 01:31:44 +03:00
|
|
|
int32_t fs_contigsumsize; /* size of cluster summary array */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_maxsymlinklen; /* max length of an internal symlink */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_old_inodefmt; /* format of on-disk inodes */
|
1994-10-20 07:20:55 +03:00
|
|
|
u_int64_t fs_maxfilesize; /* maximum representable file size */
|
2001-09-02 05:58:30 +04:00
|
|
|
int64_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */
|
|
|
|
int64_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */
|
2001-07-27 05:28:06 +04:00
|
|
|
int32_t fs_state; /* validate fs_clean field (UNUSED) */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t fs_old_postblformat; /* format of positional layout tables */
|
|
|
|
int32_t fs_old_nrpos; /* number of rotational positions */
|
|
|
|
int32_t fs_spare5[2]; /* old fs_postbloff */
|
|
|
|
/* old fs_rotbloff */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t fs_magic; /* magic number */
|
1994-06-08 15:41:58 +04:00
|
|
|
};
|
1994-10-20 07:20:55 +03:00
|
|
|
|
2008-07-31 12:44:21 +04:00
|
|
|
#define fs_old_postbloff fs_spare5[0]
|
|
|
|
#define fs_old_rotbloff fs_spare5[1]
|
|
|
|
#define fs_old_postbl_start fs_maxbsize
|
|
|
|
#define fs_old_headswitch fs_id[0]
|
|
|
|
#define fs_old_trkseek fs_id[1]
|
|
|
|
#define fs_old_csmask fs_spare1[0]
|
|
|
|
#define fs_old_csshift fs_spare1[1]
|
2003-04-02 14:39:19 +04:00
|
|
|
|
2008-07-31 12:44:21 +04:00
|
|
|
#define FS_42POSTBLFMT -1 /* 4.2BSD rotational table format */
|
|
|
|
#define FS_DYNAMICPOSTBLFMT 1 /* dynamic rotational table format */
|
2003-04-02 14:39:19 +04:00
|
|
|
|
2004-01-03 22:18:17 +03:00
|
|
|
#define old_fs_postbl(fs_, cylno, opostblsave) \
|
|
|
|
((((fs_)->fs_old_postblformat == FS_42POSTBLFMT) || \
|
|
|
|
((fs_)->fs_old_postbloff == offsetof(struct fs, fs_old_postbl_start))) \
|
|
|
|
? ((int16_t *)(opostblsave) + (cylno) * (fs_)->fs_old_nrpos) \
|
|
|
|
: ((int16_t *)((uint8_t *)(fs_) + \
|
|
|
|
(fs_)->fs_old_postbloff) + (cylno) * (fs_)->fs_old_nrpos))
|
|
|
|
#define old_fs_rotbl(fs) \
|
|
|
|
(((fs)->fs_old_postblformat == FS_42POSTBLFMT) \
|
|
|
|
? ((uint8_t *)(&(fs)->fs_magic+1)) \
|
|
|
|
: ((uint8_t *)((uint8_t *)(fs) + (fs)->fs_old_rotbloff)))
|
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
/*
|
2001-08-30 12:31:25 +04:00
|
|
|
* File system identification
|
1994-06-08 15:41:58 +04:00
|
|
|
*/
|
2003-04-02 14:39:19 +04:00
|
|
|
#define FS_UFS1_MAGIC 0x011954 /* UFS1 fast file system magic number */
|
2003-04-05 17:37:36 +04:00
|
|
|
#define FS_UFS2_MAGIC 0x19540119 /* UFS2 fast file system magic number */
|
2008-07-31 12:44:21 +04:00
|
|
|
#define FS_UFS1_MAGIC_SWAPPED 0x54190100
|
|
|
|
#define FS_UFS2_MAGIC_SWAPPED 0x19015419
|
1994-06-08 15:41:58 +04:00
|
|
|
#define FS_OKAY 0x7c269d38 /* superblock checksum */
|
2001-08-30 12:31:25 +04:00
|
|
|
#define FS_42INODEFMT -1 /* 4.2BSD inode format */
|
|
|
|
#define FS_44INODEFMT 2 /* 4.4BSD inode format */
|
1995-04-13 01:21:00 +04:00
|
|
|
|
|
|
|
/*
|
2001-08-30 12:31:25 +04:00
|
|
|
* File system clean flags
|
1995-04-13 01:21:00 +04:00
|
|
|
*/
|
|
|
|
#define FS_ISCLEAN 0x01
|
|
|
|
#define FS_WASCLEAN 0x02
|
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
/*
|
|
|
|
* Preference for optimization.
|
|
|
|
*/
|
2001-08-30 12:31:25 +04:00
|
|
|
#define FS_OPTTIME 0 /* minimize allocation time */
|
|
|
|
#define FS_OPTSPACE 1 /* minimize disk fragmentation */
|
1994-06-08 15:41:58 +04:00
|
|
|
|
1999-11-15 21:49:07 +03:00
|
|
|
/*
|
2001-08-30 12:31:25 +04:00
|
|
|
* File system flags
|
1999-11-15 21:49:07 +03:00
|
|
|
*/
|
2008-07-31 09:38:04 +04:00
|
|
|
#define FS_UNCLEAN 0x001 /* file system not clean at mount (unused) */
|
|
|
|
#define FS_DOSOFTDEP 0x002 /* file system using soft dependencies */
|
2008-07-31 12:44:21 +04:00
|
|
|
#define FS_NEEDSFSCK 0x004 /* needs sync fsck (FreeBSD compat, unused) */
|
|
|
|
#define FS_INDEXDIRS 0x008 /* kernel supports indexed directories */
|
|
|
|
#define FS_ACLS 0x010 /* file system has ACLs enabled */
|
|
|
|
#define FS_MULTILABEL 0x020 /* file system is MAC multi-label */
|
2009-05-13 01:01:02 +04:00
|
|
|
#define FS_GJOURNAL 0x40 /* gjournaled file system */
|
2008-07-31 12:44:21 +04:00
|
|
|
#define FS_FLAGS_UPDATED 0x80 /* flags have been moved to new location */
|
|
|
|
#define FS_DOWAPBL 0x100 /* Write ahead physical block logging */
|
2008-07-31 09:38:04 +04:00
|
|
|
|
|
|
|
/* File system flags that are ok for NetBSD if set in fs_flags */
|
2008-07-31 12:44:21 +04:00
|
|
|
#define FS_KNOWN_FLAGS (FS_DOSOFTDEP | FS_DOWAPBL)
|
1999-11-15 21:49:07 +03:00
|
|
|
|
|
|
|
/*
|
2001-08-30 12:31:25 +04:00
|
|
|
* File system internal flags, also in fs_flags.
|
|
|
|
* (Pick highest number to avoid conflicts with others)
|
1999-11-15 21:49:07 +03:00
|
|
|
*/
|
2003-04-02 14:39:19 +04:00
|
|
|
#define FS_SWAPPED 0x80000000 /* file system is endian swapped */
|
|
|
|
#define FS_INTERNAL 0x80000000 /* mask for internal flags */
|
1994-06-08 15:41:58 +04:00
|
|
|
|
2004-05-25 18:54:55 +04:00
|
|
|
/*
|
|
|
|
* Macros to access bits in the fs_active array.
|
|
|
|
*/
|
2008-07-31 12:44:21 +04:00
|
|
|
#define ACTIVECG_SET(fs, cg) \
|
2004-05-25 18:54:55 +04:00
|
|
|
do { \
|
|
|
|
if ((fs)->fs_active != NULL) \
|
|
|
|
setbit((fs)->fs_active, (cg)); \
|
|
|
|
} while (/*CONSTCOND*/ 0)
|
2008-07-31 12:44:21 +04:00
|
|
|
#define ACTIVECG_CLR(fs, cg) \
|
2004-05-25 18:54:55 +04:00
|
|
|
do { \
|
|
|
|
if ((fs)->fs_active != NULL) \
|
|
|
|
clrbit((fs)->fs_active, (cg)); \
|
|
|
|
} while (/*CONSTCOND*/ 0)
|
2008-07-31 12:44:21 +04:00
|
|
|
#define ACTIVECG_ISSET(fs, cg) \
|
2004-05-25 18:54:55 +04:00
|
|
|
((fs)->fs_active != NULL && isset((fs)->fs_active, (cg)))
|
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
/*
|
|
|
|
* The size of a cylinder group is calculated by CGSIZE. The maximum size
|
1994-12-13 22:10:43 +03:00
|
|
|
* is limited by the fact that cylinder groups are at most one block.
|
|
|
|
* Its size is derived from the size of the maps maintained in the
|
|
|
|
* cylinder group and the (struct cg) size.
|
1994-06-08 15:41:58 +04:00
|
|
|
*/
|
2003-08-21 18:41:00 +04:00
|
|
|
#define CGSIZE_IF(fs, ipg, fpg) \
|
1994-10-20 07:20:55 +03:00
|
|
|
/* base cg */ (sizeof(struct cg) + sizeof(int32_t) + \
|
2003-04-02 14:39:19 +04:00
|
|
|
/* old btotoff */ (fs)->fs_old_cpg * sizeof(int32_t) + \
|
|
|
|
/* old boff */ (fs)->fs_old_cpg * sizeof(u_int16_t) + \
|
2003-08-21 18:41:00 +04:00
|
|
|
/* inode map */ howmany((ipg), NBBY) + \
|
|
|
|
/* block map */ howmany((fpg), NBBY) +\
|
1994-06-08 15:41:58 +04:00
|
|
|
/* if present */ ((fs)->fs_contigsumsize <= 0 ? 0 : \
|
1994-10-20 07:20:55 +03:00
|
|
|
/* cluster sum */ (fs)->fs_contigsumsize * sizeof(int32_t) + \
|
2003-08-21 18:41:00 +04:00
|
|
|
/* cluster map */ howmany(fragstoblks(fs, (fpg)), NBBY)))
|
|
|
|
|
|
|
|
#define CGSIZE(fs) CGSIZE_IF((fs), (fs)->fs_ipg, (fs)->fs_fpg)
|
2003-04-02 14:39:19 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The minimal number of cylinder groups that should be created.
|
|
|
|
*/
|
2008-07-31 12:44:21 +04:00
|
|
|
#define MINCYLGRPS 4
|
2003-04-02 14:39:19 +04:00
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Convert cylinder group to base address of its global summary info.
|
|
|
|
*/
|
2001-09-02 05:58:30 +04:00
|
|
|
#define fs_cs(fs, indx) fs_csp[indx]
|
1994-06-08 15:41:58 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Cylinder group block for a file system.
|
|
|
|
*/
|
|
|
|
#define CG_MAGIC 0x090255
|
1994-12-13 22:10:43 +03:00
|
|
|
struct cg {
|
|
|
|
int32_t cg_firstfield; /* historic cyl groups linked list */
|
|
|
|
int32_t cg_magic; /* magic number */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t cg_old_time; /* time last written */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t cg_cgx; /* we are the cgx'th cylinder group */
|
2003-04-02 14:39:19 +04:00
|
|
|
int16_t cg_old_ncyl; /* number of cyl's this cg */
|
|
|
|
int16_t cg_old_niblk; /* number of inode blocks this cg */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t cg_ndblk; /* number of data blocks this cg */
|
1994-12-14 16:03:35 +03:00
|
|
|
struct csum cg_cs; /* cylinder summary information */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t cg_rotor; /* position of last used block */
|
|
|
|
int32_t cg_frotor; /* position of last used frag */
|
|
|
|
int32_t cg_irotor; /* position of last used inode */
|
|
|
|
int32_t cg_frsum[MAXFRAG]; /* counts of available frags */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t cg_old_btotoff; /* (int32) block totals per cylinder */
|
|
|
|
int32_t cg_old_boff; /* (u_int16) free block positions */
|
1994-12-13 22:10:43 +03:00
|
|
|
int32_t cg_iusedoff; /* (u_int8) used inode map */
|
|
|
|
int32_t cg_freeoff; /* (u_int8) free block map */
|
|
|
|
int32_t cg_nextfreeoff; /* (u_int8) next available space */
|
|
|
|
int32_t cg_clustersumoff; /* (u_int32) counts of avail clusters */
|
|
|
|
int32_t cg_clusteroff; /* (u_int8) free cluster map */
|
|
|
|
int32_t cg_nclusterblks; /* number of clusters this cg */
|
2003-04-02 14:39:19 +04:00
|
|
|
int32_t cg_niblk; /* number of inode blocks this cg */
|
|
|
|
int32_t cg_initediblk; /* last initialized inode */
|
|
|
|
int32_t cg_sparecon32[3]; /* reserved for future use */
|
|
|
|
int64_t cg_time; /* time last written */
|
|
|
|
int64_t cg_sparecon64[3]; /* reserved for future use */
|
1994-10-20 07:20:55 +03:00
|
|
|
u_int8_t cg_space[1]; /* space for cylinder group maps */
|
1994-06-08 15:41:58 +04:00
|
|
|
/* actually longer */
|
|
|
|
};
|
1994-10-20 07:20:55 +03:00
|
|
|
|
2003-04-02 14:39:19 +04:00
|
|
|
/*
|
|
|
|
* The following structure is defined
|
|
|
|
* for compatibility with old file systems.
|
|
|
|
*/
|
|
|
|
struct ocg {
|
|
|
|
int32_t cg_firstfield; /* historic linked list of cyl groups */
|
|
|
|
int32_t cg_unused_1; /* used for incore cyl groups */
|
|
|
|
int32_t cg_time; /* time last written */
|
|
|
|
int32_t cg_cgx; /* we are the cgx'th cylinder group */
|
|
|
|
int16_t cg_ncyl; /* number of cyl's this cg */
|
|
|
|
int16_t cg_niblk; /* number of inode blocks this cg */
|
|
|
|
int32_t cg_ndblk; /* number of data blocks this cg */
|
|
|
|
struct csum cg_cs; /* cylinder summary information */
|
|
|
|
int32_t cg_rotor; /* position of last used block */
|
|
|
|
int32_t cg_frotor; /* position of last used frag */
|
|
|
|
int32_t cg_irotor; /* position of last used inode */
|
|
|
|
int32_t cg_frsum[8]; /* counts of available frags */
|
|
|
|
int32_t cg_btot[32]; /* block totals per cylinder */
|
|
|
|
int16_t cg_b[32][8]; /* positions of free blocks */
|
|
|
|
u_int8_t cg_iused[256]; /* used inode map */
|
|
|
|
int32_t cg_magic; /* magic number */
|
|
|
|
u_int8_t cg_free[1]; /* free block map */
|
|
|
|
/* actually longer */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
/*
|
2003-04-05 17:37:36 +04:00
|
|
|
* Macros for access to cylinder group array structures.
|
1994-06-08 15:41:58 +04:00
|
|
|
*/
|
2008-07-31 12:44:21 +04:00
|
|
|
#define old_cg_blktot_old(cgp, ns) \
|
2004-01-03 22:18:17 +03:00
|
|
|
(((struct ocg *)(cgp))->cg_btot)
|
2008-07-31 12:44:21 +04:00
|
|
|
#define old_cg_blks_old(fs, cgp, cylno, ns) \
|
2004-01-03 22:18:17 +03:00
|
|
|
(((struct ocg *)(cgp))->cg_b[cylno])
|
|
|
|
|
2008-07-31 12:44:21 +04:00
|
|
|
#define old_cg_blktot_new(cgp, ns) \
|
2004-01-03 22:18:17 +03:00
|
|
|
((int32_t *)((u_int8_t *)(cgp) + \
|
|
|
|
ufs_rw32((cgp)->cg_old_btotoff, (ns))))
|
2008-07-31 12:44:21 +04:00
|
|
|
#define old_cg_blks_new(fs, cgp, cylno, ns) \
|
2004-01-03 22:18:17 +03:00
|
|
|
((int16_t *)((u_int8_t *)(cgp) + \
|
|
|
|
ufs_rw32((cgp)->cg_old_boff, (ns))) + (cylno) * (fs)->fs_old_nrpos)
|
|
|
|
|
2008-07-31 12:44:21 +04:00
|
|
|
#define old_cg_blktot(cgp, ns) \
|
2004-01-03 22:18:17 +03:00
|
|
|
((ufs_rw32((cgp)->cg_magic, (ns)) != CG_MAGIC) ? \
|
|
|
|
old_cg_blktot_old(cgp, ns) : old_cg_blktot_new(cgp, ns))
|
2008-07-31 12:44:21 +04:00
|
|
|
#define old_cg_blks(fs, cgp, cylno, ns) \
|
2004-01-03 22:18:17 +03:00
|
|
|
((ufs_rw32((cgp)->cg_magic, (ns)) != CG_MAGIC) ? \
|
|
|
|
old_cg_blks_old(fs, cgp, cylno, ns) : old_cg_blks_new(fs, cgp, cylno, ns))
|
|
|
|
|
2003-04-05 17:37:36 +04:00
|
|
|
#define cg_inosused_new(cgp, ns) \
|
2003-04-02 14:39:19 +04:00
|
|
|
((u_int8_t *)((u_int8_t *)(cgp) + \
|
|
|
|
ufs_rw32((cgp)->cg_iusedoff, (ns))))
|
2003-04-05 17:37:36 +04:00
|
|
|
#define cg_blksfree_new(cgp, ns) \
|
2003-04-02 14:39:19 +04:00
|
|
|
((u_int8_t *)((u_int8_t *)(cgp) + \
|
|
|
|
ufs_rw32((cgp)->cg_freeoff, (ns))))
|
2003-04-05 17:37:36 +04:00
|
|
|
#define cg_chkmagic_new(cgp, ns) \
|
2003-04-02 14:39:19 +04:00
|
|
|
(ufs_rw32((cgp)->cg_magic, (ns)) == CG_MAGIC)
|
2003-04-05 17:37:36 +04:00
|
|
|
|
2008-07-31 12:44:21 +04:00
|
|
|
#define cg_inosused_old(cgp, ns) \
|
2003-04-05 17:37:36 +04:00
|
|
|
(((struct ocg *)(cgp))->cg_iused)
|
2008-07-31 12:44:21 +04:00
|
|
|
#define cg_blksfree_old(cgp, ns) \
|
2003-04-05 17:37:36 +04:00
|
|
|
(((struct ocg *)(cgp))->cg_free)
|
2008-07-31 12:44:21 +04:00
|
|
|
#define cg_chkmagic_old(cgp, ns) \
|
2003-04-05 17:37:36 +04:00
|
|
|
(ufs_rw32(((struct ocg *)(cgp))->cg_magic, (ns)) == CG_MAGIC)
|
|
|
|
|
2008-07-31 12:44:21 +04:00
|
|
|
#define cg_inosused(cgp, ns) \
|
2003-04-05 17:37:36 +04:00
|
|
|
((ufs_rw32((cgp)->cg_magic, (ns)) != CG_MAGIC) ? \
|
|
|
|
cg_inosused_old(cgp, ns) : cg_inosused_new(cgp, ns))
|
2008-07-31 12:44:21 +04:00
|
|
|
#define cg_blksfree(cgp, ns) \
|
2003-04-05 17:37:36 +04:00
|
|
|
((ufs_rw32((cgp)->cg_magic, (ns)) != CG_MAGIC) ? \
|
|
|
|
cg_blksfree_old(cgp, ns) : cg_blksfree_new(cgp, ns))
|
2008-07-31 12:44:21 +04:00
|
|
|
#define cg_chkmagic(cgp, ns) \
|
2003-04-05 17:37:36 +04:00
|
|
|
(cg_chkmagic_new(cgp, ns) || cg_chkmagic_old(cgp, ns))
|
|
|
|
|
2001-08-30 12:31:25 +04:00
|
|
|
#define cg_clustersfree(cgp, ns) \
|
1998-03-18 18:57:26 +03:00
|
|
|
((u_int8_t *)((u_int8_t *)(cgp) + \
|
|
|
|
ufs_rw32((cgp)->cg_clusteroff, (ns))))
|
2001-08-30 12:31:25 +04:00
|
|
|
#define cg_clustersum(cgp, ns) \
|
1998-03-18 18:57:26 +03:00
|
|
|
((int32_t *)((u_int8_t *)(cgp) + \
|
|
|
|
ufs_rw32((cgp)->cg_clustersumoff, (ns))))
|
2005-02-27 01:31:44 +03:00
|
|
|
|
1994-06-08 15:41:58 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Turn file system block numbers into disk block addresses.
|
|
|
|
* This maps file system blocks to device size blocks.
|
|
|
|
*/
|
2010-01-31 13:54:10 +03:00
|
|
|
#if defined (_KERNEL)
|
|
|
|
#define fsbtodb(fs, b) ((b) << ((fs)->fs_fshift - DEV_BSHIFT))
|
|
|
|
#define dbtofsb(fs, b) ((b) >> ((fs)->fs_fshift - DEV_BSHIFT))
|
|
|
|
#else
|
2001-08-30 12:31:25 +04:00
|
|
|
#define fsbtodb(fs, b) ((b) << (fs)->fs_fsbtodb)
|
1994-06-08 15:41:58 +04:00
|
|
|
#define dbtofsb(fs, b) ((b) >> (fs)->fs_fsbtodb)
|
2010-01-31 13:54:10 +03:00
|
|
|
#endif
|
1994-06-08 15:41:58 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Cylinder group macros to locate things in cylinder groups.
|
|
|
|
* They calc file system addresses of cylinder group data structures.
|
|
|
|
*/
|
2003-04-03 20:07:09 +04:00
|
|
|
#define cgbase(fs, c) (((daddr_t)(fs)->fs_fpg) * (c))
|
2003-08-21 18:41:00 +04:00
|
|
|
#define cgstart_ufs1(fs, c) \
|
|
|
|
(cgbase(fs, c) + (fs)->fs_old_cgoffset * ((c) & ~((fs)->fs_old_cgmask)))
|
|
|
|
#define cgstart_ufs2(fs, c) cgbase((fs), (c))
|
|
|
|
#define cgstart(fs, c) ((fs)->fs_magic == FS_UFS2_MAGIC \
|
|
|
|
? cgstart_ufs2((fs), (c)) : cgstart_ufs1((fs), (c)))
|
1994-06-08 15:41:58 +04:00
|
|
|
#define cgdmin(fs, c) (cgstart(fs, c) + (fs)->fs_dblkno) /* 1st data */
|
|
|
|
#define cgimin(fs, c) (cgstart(fs, c) + (fs)->fs_iblkno) /* inode blk */
|
|
|
|
#define cgsblock(fs, c) (cgstart(fs, c) + (fs)->fs_sblkno) /* super blk */
|
|
|
|
#define cgtod(fs, c) (cgstart(fs, c) + (fs)->fs_cblkno) /* cg block */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Macros for handling inode numbers:
|
|
|
|
* inode number to file system block offset.
|
|
|
|
* inode number to cylinder group number.
|
|
|
|
* inode number to file system block address.
|
|
|
|
*/
|
|
|
|
#define ino_to_cg(fs, x) ((x) / (fs)->fs_ipg)
|
|
|
|
#define ino_to_fsba(fs, x) \
|
2003-01-25 00:55:02 +03:00
|
|
|
((daddr_t)(cgimin(fs, ino_to_cg(fs, x)) + \
|
1994-06-08 15:41:58 +04:00
|
|
|
(blkstofrags((fs), (((x) % (fs)->fs_ipg) / INOPB(fs))))))
|
|
|
|
#define ino_to_fsbo(fs, x) ((x) % INOPB(fs))
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Give cylinder group number for a file system block.
|
|
|
|
* Give cylinder group block number for a file system block.
|
|
|
|
*/
|
|
|
|
#define dtog(fs, d) ((d) / (fs)->fs_fpg)
|
|
|
|
#define dtogd(fs, d) ((d) % (fs)->fs_fpg)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Extract the bits for a block from a map.
|
|
|
|
* Compute the cylinder and rotational position of a cyl block addr.
|
|
|
|
*/
|
2001-08-30 12:31:25 +04:00
|
|
|
#define blkmap(fs, map, loc) \
|
1994-06-08 15:41:58 +04:00
|
|
|
(((map)[(loc) / NBBY] >> ((loc) % NBBY)) & (0xff >> (NBBY - (fs)->fs_frag)))
|
2004-01-03 22:18:17 +03:00
|
|
|
#define old_cbtocylno(fs, bno) \
|
|
|
|
(fsbtodb(fs, bno) / (fs)->fs_old_spc)
|
|
|
|
#define old_cbtorpos(fs, bno) \
|
|
|
|
((fs)->fs_old_nrpos <= 1 ? 0 : \
|
|
|
|
(fsbtodb(fs, bno) % (fs)->fs_old_spc / (fs)->fs_old_nsect * (fs)->fs_old_trackskew + \
|
|
|
|
fsbtodb(fs, bno) % (fs)->fs_old_spc % (fs)->fs_old_nsect * (fs)->fs_old_interleave) % \
|
|
|
|
(fs)->fs_old_nsect * (fs)->fs_old_nrpos / (fs)->fs_old_npsect)
|
1994-06-08 15:41:58 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The following macros optimize certain frequently calculated
|
|
|
|
* quantities by using shifts and masks in place of divisions
|
|
|
|
* modulos and multiplications.
|
|
|
|
*/
|
2001-08-30 12:31:25 +04:00
|
|
|
#define blkoff(fs, loc) /* calculates (loc % fs->fs_bsize) */ \
|
1994-06-08 15:41:58 +04:00
|
|
|
((loc) & (fs)->fs_qbmask)
|
2001-08-30 12:31:25 +04:00
|
|
|
#define fragoff(fs, loc) /* calculates (loc % fs->fs_fsize) */ \
|
1994-06-08 15:41:58 +04:00
|
|
|
((loc) & (fs)->fs_qfmask)
|
2008-07-31 12:44:21 +04:00
|
|
|
#define lfragtosize(fs, frag) /* calculates ((off_t)frag * fs->fs_fsize) */ \
|
2003-04-03 20:07:09 +04:00
|
|
|
(((off_t)(frag)) << (fs)->fs_fshift)
|
2001-08-31 07:15:45 +04:00
|
|
|
#define lblktosize(fs, blk) /* calculates ((off_t)blk * fs->fs_bsize) */ \
|
2003-04-03 20:07:09 +04:00
|
|
|
(((off_t)(blk)) << (fs)->fs_bshift)
|
2001-08-30 12:31:25 +04:00
|
|
|
#define lblkno(fs, loc) /* calculates (loc / fs->fs_bsize) */ \
|
1994-06-08 15:41:58 +04:00
|
|
|
((loc) >> (fs)->fs_bshift)
|
2001-08-30 12:31:25 +04:00
|
|
|
#define numfrags(fs, loc) /* calculates (loc / fs->fs_fsize) */ \
|
1994-06-08 15:41:58 +04:00
|
|
|
((loc) >> (fs)->fs_fshift)
|
2001-08-30 12:31:25 +04:00
|
|
|
#define blkroundup(fs, size) /* calculates roundup(size, fs->fs_bsize) */ \
|
1994-06-08 15:41:58 +04:00
|
|
|
(((size) + (fs)->fs_qbmask) & (fs)->fs_bmask)
|
2001-08-30 12:31:25 +04:00
|
|
|
#define fragroundup(fs, size) /* calculates roundup(size, fs->fs_fsize) */ \
|
1994-06-08 15:41:58 +04:00
|
|
|
(((size) + (fs)->fs_qfmask) & (fs)->fs_fmask)
|
2001-08-30 12:31:25 +04:00
|
|
|
#define fragstoblks(fs, frags) /* calculates (frags / fs->fs_frag) */ \
|
1994-06-08 15:41:58 +04:00
|
|
|
((frags) >> (fs)->fs_fragshift)
|
2001-08-30 12:31:25 +04:00
|
|
|
#define blkstofrags(fs, blks) /* calculates (blks * fs->fs_frag) */ \
|
1994-06-08 15:41:58 +04:00
|
|
|
((blks) << (fs)->fs_fragshift)
|
2001-08-30 12:31:25 +04:00
|
|
|
#define fragnum(fs, fsb) /* calculates (fsb % fs->fs_frag) */ \
|
1994-06-08 15:41:58 +04:00
|
|
|
((fsb) & ((fs)->fs_frag - 1))
|
2001-08-30 12:31:25 +04:00
|
|
|
#define blknum(fs, fsb) /* calculates rounddown(fsb, fs->fs_frag) */ \
|
1994-06-08 15:41:58 +04:00
|
|
|
((fsb) &~ ((fs)->fs_frag - 1))
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Determine the number of available frags given a
|
1994-10-20 07:20:55 +03:00
|
|
|
* percentage to hold in reserve.
|
1994-06-08 15:41:58 +04:00
|
|
|
*/
|
2001-08-30 12:31:25 +04:00
|
|
|
#define freespace(fs, percentreserved) \
|
1994-06-08 15:41:58 +04:00
|
|
|
(blkstofrags((fs), (fs)->fs_cstotal.cs_nbfree) + \
|
2001-08-31 07:15:45 +04:00
|
|
|
(fs)->fs_cstotal.cs_nffree - \
|
2003-04-03 20:07:09 +04:00
|
|
|
(((off_t)((fs)->fs_dsize)) * (percentreserved) / 100))
|
1994-06-08 15:41:58 +04:00
|
|
|
|
1994-12-13 22:10:43 +03:00
|
|
|
/*
|
|
|
|
* Determining the size of a file block in the file system.
|
|
|
|
*/
|
2001-08-30 12:31:25 +04:00
|
|
|
#define blksize(fs, ip, lbn) \
|
2003-04-02 14:39:19 +04:00
|
|
|
(((lbn) >= NDADDR || (ip)->i_size >= lblktosize(fs, (lbn) + 1)) \
|
1994-06-08 15:41:58 +04:00
|
|
|
? (fs)->fs_bsize \
|
2003-04-02 14:39:19 +04:00
|
|
|
: (fragroundup(fs, blkoff(fs, (ip)->i_size))))
|
|
|
|
|
2008-07-31 12:44:21 +04:00
|
|
|
#define sblksize(fs, size, lbn) \
|
2003-04-02 14:39:19 +04:00
|
|
|
(((lbn) >= NDADDR || (size) >= ((lbn) + 1) << (fs)->fs_bshift) \
|
|
|
|
? (fs)->fs_bsize \
|
|
|
|
: (fragroundup(fs, blkoff(fs, (size)))))
|
1994-06-08 15:41:58 +04:00
|
|
|
|
|
|
|
|
1994-12-13 22:10:43 +03:00
|
|
|
/*
|
|
|
|
* Number of inodes in a secondary storage block/fragment.
|
|
|
|
*/
|
1994-06-08 15:41:58 +04:00
|
|
|
#define INOPB(fs) ((fs)->fs_inopb)
|
|
|
|
#define INOPF(fs) ((fs)->fs_inopb >> (fs)->fs_fragshift)
|
|
|
|
|
1994-12-13 22:10:43 +03:00
|
|
|
/*
|
|
|
|
* Number of indirects in a file system block.
|
|
|
|
*/
|
1994-06-08 15:41:58 +04:00
|
|
|
#define NINDIR(fs) ((fs)->fs_nindir)
|
2001-07-27 05:28:06 +04:00
|
|
|
|
2002-09-29 00:11:05 +04:00
|
|
|
/*
|
|
|
|
* Apple UFS Label:
|
|
|
|
* We check for this to decide to use APPLEUFS_DIRBLKSIZ
|
|
|
|
*/
|
2008-07-31 12:44:21 +04:00
|
|
|
#define APPLEUFS_LABEL_MAGIC 0x4c41424c /* LABL */
|
|
|
|
#define APPLEUFS_LABEL_SIZE 1024
|
|
|
|
#define APPLEUFS_LABEL_OFFSET (BBSIZE - APPLEUFS_LABEL_SIZE) /* located at 7k */
|
|
|
|
#define APPLEUFS_LABEL_VERSION 1
|
|
|
|
#define APPLEUFS_MAX_LABEL_NAME 512
|
2002-09-29 00:11:05 +04:00
|
|
|
|
|
|
|
struct appleufslabel {
|
|
|
|
u_int32_t ul_magic;
|
|
|
|
u_int16_t ul_checksum;
|
2004-01-02 09:57:46 +03:00
|
|
|
u_int16_t ul_unused0;
|
2002-09-29 00:11:05 +04:00
|
|
|
u_int32_t ul_version;
|
|
|
|
u_int32_t ul_time;
|
|
|
|
u_int16_t ul_namelen;
|
2004-01-02 08:08:57 +03:00
|
|
|
u_char ul_name[APPLEUFS_MAX_LABEL_NAME]; /* Warning: may not be null terminated */
|
2004-01-02 09:57:46 +03:00
|
|
|
u_int16_t ul_unused1;
|
|
|
|
u_int64_t ul_uuid; /* Note this is only 4 byte aligned */
|
2004-01-02 08:08:57 +03:00
|
|
|
u_char ul_reserved[24];
|
2002-09-29 00:11:05 +04:00
|
|
|
u_char ul_unused[460];
|
2007-12-25 21:33:32 +03:00
|
|
|
} __packed;
|
2002-09-29 00:11:05 +04:00
|
|
|
|
|
|
|
|
2001-07-27 05:28:06 +04:00
|
|
|
#endif /* !_UFS_FFS_FS_H_ */
|