Use MIN/MAX macros from sys/param.h.
MFC after: 2 weeks.
This commit is contained in:
parent
eff97b5e63
commit
a8945bbf62
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=298911
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user