diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-05-30 08:35:23 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-05-30 08:35:23 +0000 |
| commit | abede2744bbad7139d9bd3435f5f7ca1d4e85e51 (patch) | |
| tree | 8db1f2051b877c6f22dc49bb6d13be81d4235ec4 /sys/ufs/ffs/fs.h | |
| parent | ec6ef49763f047e88c3866301e0e71dc29900b97 (diff) | |
Integrate new ext2fs, reverting ufs support for the old one.
Diffstat (limited to 'sys/ufs/ffs/fs.h')
| -rw-r--r-- | sys/ufs/ffs/fs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h index 9be61300829..e5a17da3a22 100644 --- a/sys/ufs/ffs/fs.h +++ b/sys/ufs/ffs/fs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fs.h,v 1.3 1997/02/24 14:27:13 niklas Exp $ */ +/* $OpenBSD: fs.h,v 1.4 1997/05/30 08:34:28 downsj Exp $ */ /* $NetBSD: fs.h,v 1.6 1995/04/12 21:21:02 mycroft Exp $ */ /* @@ -482,9 +482,9 @@ struct ocg { * 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_bshift) \ + (((lbn) >= NDADDR || (ip)->i_ffs_size >= ((lbn) + 1) << (fs)->fs_bshift) \ ? (fs)->fs_bsize \ - : (fragroundup(fs, blkoff(fs, (ip)->i_size)))) + : (fragroundup(fs, blkoff(fs, (ip)->i_ffs_size)))) #define dblksize(fs, dip, lbn) \ (((lbn) >= NDADDR || (dip)->di_size >= ((lbn) + 1) << (fs)->fs_bshift) \ ? (fs)->fs_bsize \ |