From: Eric Whitney Date: Fri, 31 Mar 2017 23:21:59 +0000 (-0400) Subject: e2fsck: fix type mismatches in quota warning message X-Git-Tag: v1.43.5~64 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f09669fc688951531ddddadd97d72aea7f48e741;p=thirdparty%2Fe2fsprogs.git e2fsck: fix type mismatches in quota warning message The conversion operations in the format control strings found in the fprintf call used to print the quota warning message do not match the types of their corresponding arguments. Although this probably hasn't generally been a problem, it obfuscates a bigalloc quota accounting bug where the reported actual quota goes negative. Clean up the mismatches and some unnecessary casts. While we're at it, fix a spelling nit in a related comment. Signed-off-by: Eric Whitney Signed-off-by: Theodore Ts'o --- diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c index 86292667c..1bb43a71c 100644 --- a/lib/support/mkquota.c +++ b/lib/support/mkquota.c @@ -518,16 +518,16 @@ static int scan_dquots_callback(struct dquot *dquot, void *cb_data) print_dquot("mem", dq); print_dquot("dsk", dquot); - /* Check if there is inconsistancy. */ + /* Check if there is inconsistency */ if (dq->dq_dqb.dqb_curspace != dquot->dq_dqb.dqb_curspace || dq->dq_dqb.dqb_curinodes != dquot->dq_dqb.dqb_curinodes) { scan_data->usage_is_inconsistent = 1; - fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %d:" - "actual (%llu, %llu) != expected (%llu, %llu)\n", - dq->dq_id, (long long)dq->dq_dqb.dqb_curspace, - (long long)dq->dq_dqb.dqb_curinodes, - (long long)dquot->dq_dqb.dqb_curspace, - (long long)dquot->dq_dqb.dqb_curinodes); + fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %u:" + "actual (%lld, %lld) != expected (%lld, %lld)\n", + dq->dq_id, dq->dq_dqb.dqb_curspace, + dq->dq_dqb.dqb_curinodes, + dquot->dq_dqb.dqb_curspace, + dquot->dq_dqb.dqb_curinodes); } if (scan_data->update_limits) {