diff options
| -rw-r--r-- | quotaio_v1.c | 6 | ||||
| -rw-r--r-- | quotaio_xfs.c | 2 | ||||
| -rw-r--r-- | rquota_client.c | 4 | ||||
| -rw-r--r-- | rquota_server.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/quotaio_v1.c b/quotaio_v1.c index 92ee19d..c3165b9 100644 --- a/quotaio_v1.c +++ b/quotaio_v1.c @@ -34,7 +34,7 @@ #ident "$Copyright: (c) 1980, 1990 Regents of the University of California. $" #ident "$Copyright: All rights reserved. $" -#ident "$Id: quotaio_v1.c,v 1.5 2001/05/04 08:43:25 jkar8572 Exp $" +#ident "$Id: quotaio_v1.c,v 1.6 2001/07/17 21:02:55 jkar8572 Exp $" #include <unistd.h> #include <errno.h> @@ -74,7 +74,7 @@ static inline void v1_disk2memdqblk(struct util_dqblk *m, struct v1_disk_dqblk * m->dqb_bhardlimit = d->dqb_bhardlimit; m->dqb_bsoftlimit = d->dqb_bsoftlimit; m->dqb_curinodes = d->dqb_curinodes; - m->dqb_curspace = d->dqb_curblocks * V1_DQBLK_SIZE; + m->dqb_curspace = ((qsize_t)d->dqb_curblocks) * V1_DQBLK_SIZE; m->dqb_itime = d->dqb_itime; m->dqb_btime = d->dqb_btime; } @@ -102,7 +102,7 @@ static inline void v1_kern2utildqblk(struct util_dqblk *u, struct v1_kern_dqblk u->dqb_bhardlimit = k->dqb_bhardlimit; u->dqb_bsoftlimit = k->dqb_bsoftlimit; u->dqb_curinodes = k->dqb_curinodes; - u->dqb_curspace = k->dqb_curblocks << V1_DQBLK_SIZE_BITS; + u->dqb_curspace = ((qsize_t)k->dqb_curblocks) << V1_DQBLK_SIZE_BITS; u->dqb_itime = k->dqb_itime; u->dqb_btime = k->dqb_btime; } diff --git a/quotaio_xfs.c b/quotaio_xfs.c index 9656753..256238e 100644 --- a/quotaio_xfs.c +++ b/quotaio_xfs.c @@ -50,7 +50,7 @@ static inline void xfs_kern2utildqblk(struct util_dqblk *u, struct xfs_kern_dqbl u->dqb_bhardlimit = k->d_blk_hardlimit >> 1; u->dqb_bsoftlimit = k->d_blk_softlimit >> 1; u->dqb_curinodes = k->d_icount; - u->dqb_curspace = k->d_bcount << 9; + u->dqb_curspace = ((qsize_t)k->d_bcount) << 9; u->dqb_itime = k->d_itimer; u->dqb_btime = k->d_btimer; } diff --git a/rquota_client.c b/rquota_client.c index 0d1d86b..5efc920 100644 --- a/rquota_client.c +++ b/rquota_client.c @@ -9,7 +9,7 @@ * * This part does the rpc-communication with the rquotad. * - * Version: $Id: rquota_client.c,v 1.2 2001/06/07 17:51:43 jkar8572 Exp $ + * Version: $Id: rquota_client.c,v 1.3 2001/07/17 21:02:55 jkar8572 Exp $ * * Author: Marco van Wieringen <mvw@planets.elm.net> * @@ -50,7 +50,7 @@ static inline void clinet2utildqblk(struct util_dqblk *u, struct rquota *n) u->dqb_ihardlimit = n->rq_fhardlimit; u->dqb_isoftlimit = n->rq_fsoftlimit; u->dqb_curinodes = n->rq_curfiles; - u->dqb_curspace = n->rq_curblocks * n->rq_bsize; + u->dqb_curspace = ((qsize_t)n->rq_curblocks) * n->rq_bsize; time(&now); if (n->rq_btimeleft) u->dqb_btime = n->rq_btimeleft + now; diff --git a/rquota_server.c b/rquota_server.c index b1e7e80..65d5dc2 100644 --- a/rquota_server.c +++ b/rquota_server.c @@ -9,7 +9,7 @@ * * This part does the lookup of the info. * - * Version: $Id: rquota_server.c,v 1.4 2001/06/18 03:15:44 jkar8572 Exp $ + * Version: $Id: rquota_server.c,v 1.5 2001/07/17 21:02:55 jkar8572 Exp $ * * Author: Marco van Wieringen <mvw@planets.elm.net> * @@ -85,7 +85,7 @@ static inline void servnet2utildqblk(struct util_dqblk *u, sq_dqblk * n) u->dqb_bsoftlimit = n->rq_bsoftlimit; u->dqb_ihardlimit = n->rq_fhardlimit; u->dqb_isoftlimit = n->rq_fsoftlimit; - u->dqb_curspace = n->rq_curblocks << RPC_DQBLK_SIZE_BITS; + u->dqb_curspace = ((qsize_t)n->rq_curblocks) << RPC_DQBLK_SIZE_BITS; u->dqb_curinodes = n->rq_curfiles; if (n->rq_btimeleft) u->dqb_btime = n->rq_btimeleft + now; |