[src/trunk]: src/sys/ufs/lfs Merge -r1.20 and -r1.21 of ufs_quota1.c: widen b...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/43a854a6bb90
branches:  trunk
changeset: 816148:43a854a6bb90
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Jun 20 00:53:10 2016 +0000

description:
Merge -r1.20 and -r1.21 of ufs_quota1.c: widen before multiplying.

diffstat:

 sys/ufs/lfs/ulfs_quota1.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r edb1120f7544 -r 43a854a6bb90 sys/ufs/lfs/ulfs_quota1.c
--- a/sys/ufs/lfs/ulfs_quota1.c Mon Jun 20 00:52:04 2016 +0000
+++ b/sys/ufs/lfs/ulfs_quota1.c Mon Jun 20 00:53:10 2016 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ulfs_quota1.c,v 1.10 2016/06/20 00:00:47 dholland Exp $        */
-/*  from NetBSD: ufs_quota1.c,v 1.20 2014/05/24 16:34:04 christos Exp  */
+/*     $NetBSD: ulfs_quota1.c,v 1.11 2016/06/20 00:53:10 dholland Exp $        */
+/*  from NetBSD: ufs_quota1.c,v 1.22 2016/06/20 00:52:04 dholland Exp  */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota1.c,v 1.10 2016/06/20 00:00:47 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota1.c,v 1.11 2016/06/20 00:53:10 dholland Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -804,7 +804,7 @@
        aiov.iov_base = (void *)&dq->dq_un.dq1_dqb;
        aiov.iov_len = sizeof (struct dqblk);
        auio.uio_resid = sizeof (struct dqblk);
-       auio.uio_offset = (off_t)(id * sizeof (struct dqblk));
+       auio.uio_offset = (off_t)id * sizeof (struct dqblk);
        auio.uio_rw = UIO_READ;
        UIO_SETUP_SYSSPACE(&auio);
        error = VOP_READ(dqvp, &auio, 0, ump->um_cred[type]);
@@ -858,7 +858,7 @@
        aiov.iov_base = (void *)&dq->dq_un.dq1_dqb;
        aiov.iov_len = sizeof (struct dqblk);
        auio.uio_resid = sizeof (struct dqblk);
-       auio.uio_offset = (off_t)(dq->dq_id * sizeof (struct dqblk));
+       auio.uio_offset = (off_t)dq->dq_id * sizeof (struct dqblk);
        auio.uio_rw = UIO_WRITE;
        UIO_SETUP_SYSSPACE(&auio);
        error = VOP_WRITE(dqvp, &auio, 0, dq->dq_ump->um_cred[dq->dq_type]);