diff options
| author | Marcelo Araujo <araujo@FreeBSD.org> | 2016-05-02 00:45:46 +0000 |
|---|---|---|
| committer | Marcelo Araujo <araujo@FreeBSD.org> | 2016-05-02 00:45:46 +0000 |
| commit | 0193043c469c5a3ff53a082c2e1d007789a307dc (patch) | |
| tree | d7a9be20a430bb15cdb1c7625727b37b2e2475e0 /sbin | |
| parent | e921a133f1aa690e8456251dbd33b5d60f0d3e09 (diff) | |
Notes
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/newfs/mkfs.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index ee6ed96da1aa..b73697849935 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -613,8 +613,7 @@ restart: } for (i = 0; i < sblock.fs_cssize; i += sblock.fs_bsize) wtfs(fsbtodb(&sblock, sblock.fs_csaddr + numfrags(&sblock, i)), - sblock.fs_cssize - i < sblock.fs_bsize ? - sblock.fs_cssize - i : sblock.fs_bsize, + MIN(sblock.fs_cssize - i, sblock.fs_bsize), ((char *)fscs) + i); /* * Update information about this partition in pack @@ -660,8 +659,7 @@ initcg(int cylno, time_t utime) 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_frag; @@ -771,7 +769,7 @@ initcg(int cylno, time_t utime) * 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); bcopy((char *)&acg, &iobuf[start], sblock.fs_cgsize); start += sblock.fs_bsize; dp1 = (struct ufs1_dinode *)(&iobuf[start]); |