Date: Mon, 2 May 2016 00:44:19 +0000 (UTC) From: Marcelo Araujo <araujo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298905 - head/sbin/growfs Message-ID: <201605020044.u420iJZo069739@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: araujo Date: Mon May 2 00:44:19 2016 New Revision: 298905 URL: https://svnweb.freebsd.org/changeset/base/298905 Log: Use MIN() macro from sys/param.h. Reviewed by: trasz MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D6119 Modified: head/sbin/growfs/growfs.c Modified: head/sbin/growfs/growfs.c ============================================================================== --- head/sbin/growfs/growfs.c Sun May 1 22:00:41 2016 (r298904) +++ head/sbin/growfs/growfs.c Mon May 2 00:44:19 2016 (r298905) @@ -348,8 +348,7 @@ initcg(int cylno, time_t modtime, int fs 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605020044.u420iJZo069739>