Author: pfg
Date: Sun May 1 02:24:05 2016
New Revision: 298872
URL: https://svnweb.freebsd.org/changeset/base/298872
Log:
sbin: ake use of our rounddown() macro when sys/param.h is available.
No functional change.
Modified:
head/sbin/dump/main.c
head/sbin/fsck_ffs/inode.c
head/sbin/fsck_ffs/suj.c
head/sbin/geom/class/virstor/geom_virstor.c
head/sbin/recoverdisk/recoverdisk.c
Modified: head/sbin/dump/main.c
==============================================================================
--- head/sbin/dump/main.c Sun May 1 02:19:49 2016 (r298871)
+++ head/sbin/dump/main.c Sun May 1 02:24:05 2016 (r298872)
@@ -267,7 +267,7 @@ main(int argc, char *argv[])
}
if (blocksperfile)
- blocksperfile = blocksperfile / ntrec * ntrec; /* round down */
+ blocksperfile = rounddown(blocksperfile, ntrec);
else if (!unlimited) {
/*
* Determine how to default tape size and density
Modified: head/sbin/fsck_ffs/inode.c
==============================================================================
--- head/sbin/fsck_ffs/inode.c Sun May 1 02:19:49 2016 (r298871)
+++ head/sbin/fsck_ffs/inode.c Sun May 1 02:24:05 2016 (r298872)
@@ -293,7 +293,7 @@ ginode(ino_t inumber)
if (pbp != NULL)
pbp->b_flags &= ~B_INUSE;
pbp = getdatablk(iblk, sblock.fs_bsize, BT_INODES);
- startinum = (inumber / INOPB(&sblock)) * INOPB(&sblock);
+ startinum = rounddown(inumber, INOPB(&sblock));
}
if (sblock.fs_magic == FS_UFS1_MAGIC)
return ((union dinode *)
Modified: head/sbin/fsck_ffs/suj.c
==============================================================================
--- head/sbin/fsck_ffs/suj.c Sun May 1 02:19:49 2016 (r298871)
+++ head/sbin/fsck_ffs/suj.c Sun May 1 02:24:05 2016 (r298872)
@@ -911,7 +911,7 @@ ino_isat(ino_t parent, off_t diroff, ino
* certain we hit a valid record and not some junk in the middle
* of a file name. Stop when we reach or pass the expected offset.
*/
- dpoff = (doff / DIRBLKSIZ) * DIRBLKSIZ;
+ dpoff = rounddown(doff, DIRBLKSIZ);
do {
dp = (struct direct *)&block[dpoff];
if (dpoff == doff)
Modified: head/sbin/geom/class/virstor/geom_virstor.c
==============================================================================
--- head/sbin/geom/class/virstor/geom_virstor.c Sun May 1 02:19:49 2016
(r298871)
+++ head/sbin/geom/class/virstor/geom_virstor.c Sun May 1 02:24:05 2016
(r298872)
@@ -255,7 +255,7 @@ virstor_label(struct gctl_req *req)
if (md.md_chunk_size % MAXPHYS != 0) {
/* XXX: This is not strictly needed, but it's convenient to
* impose some limitations on it, so why not MAXPHYS. */
- size_t new_size = (md.md_chunk_size / MAXPHYS) * MAXPHYS;
+ size_t new_size = rounddown(md.md_chunk_size, MAXPHYS);
if (new_size < md.md_chunk_size)
new_size += MAXPHYS;
fprintf(stderr, "Resizing chunk size to be a multiple of "
Modified: head/sbin/recoverdisk/recoverdisk.c
==============================================================================
--- head/sbin/recoverdisk/recoverdisk.c Sun May 1 02:19:49 2016
(r298871)
+++ head/sbin/recoverdisk/recoverdisk.c Sun May 1 02:24:05 2016
(r298872)
@@ -207,7 +207,7 @@ main(int argc, char * const argv[])
sectorsize = stripesize;
minsize = sectorsize;
- bigsize = (bigsize / sectorsize) * sectorsize;
+ bigsize = rounddown(bigsize, sectorsize);
error = ioctl(fdr, DIOCGMEDIASIZE, &t);
if (error < 0)
@@ -222,7 +222,7 @@ main(int argc, char * const argv[])
for (ch = 0; (bigsize >> ch) > minsize; ch++)
continue;
medsize = bigsize >> (ch / 2);
- medsize = (medsize / minsize) * minsize;
+ medsize = rounddown(medsize, minsize);
fprintf(stderr, "Bigsize = %zu, medsize = %zu, minsize = %zu\n",
bigsize, medsize, minsize);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
