diff options
| author | araujo <araujo@FreeBSD.org> | 2016-05-02 01:47:13 +0000 |
|---|---|---|
| committer | araujo <araujo@FreeBSD.org> | 2016-05-02 01:47:13 +0000 |
| commit | 0c8564e5c072651d3ad7f78679054d7104e74816 (patch) | |
| tree | f0cbbcdb2af8ddb69d8509a457ecd23ec3abf624 /usr.sbin | |
| parent | 197079be042259eae1aa6b89b8d41125180bd53d (diff) | |
| download | FreeBSD-src-0c8564e5c072651d3ad7f78679054d7104e74816.zip FreeBSD-src-0c8564e5c072651d3ad7f78679054d7104e74816.tar.gz | |
Use MIN/MAX macros from sys/param.h.
MFC after: 2 weeks.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/makefs/ffs/mkfs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c index dfdaf57..eca58eb 100644 --- a/usr.sbin/makefs/ffs/mkfs.c +++ b/usr.sbin/makefs/ffs/mkfs.c @@ -610,8 +610,7 @@ initcg(int cylno, time_t utime, const fsinfo_t *fsopts) acg.cg_magic = CG_MAGIC; acg.cg_cgx = cylno; acg.cg_niblk = sblock.fs_ipg; - acg.cg_initediblk = sblock.fs_ipg < 2 * INOPB(&sblock) ? - sblock.fs_ipg : 2 * INOPB(&sblock); + acg.cg_initediblk = MIN(sblock.fs_ipg, 2 * INOPB(&sblock)); acg.cg_ndblk = dmax - cbase; if (sblock.fs_contigsumsize > 0) acg.cg_nclusterblks = acg.cg_ndblk >> sblock.fs_fragshift; @@ -730,7 +729,7 @@ initcg(int cylno, time_t utime, const fsinfo_t *fsopts) * Write out the duplicate super block, the cylinder group map * and two blocks worth of inodes in a single write. */ - start = sblock.fs_bsize > SBLOCKSIZE ? sblock.fs_bsize : SBLOCKSIZE; + start = MAX(sblock.fs_bsize, SBLOCKSIZE); memcpy(&iobuf[start], &acg, sblock.fs_cgsize); if (fsopts->needswap) ffs_cg_swap(&acg, (struct cg*)&iobuf[start], &sblock); |
