From patchwork Fri Mar 31 23:21:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Whitney X-Patchwork-Id: 745842 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vvyD53JVcz9s7C for ; Sat, 1 Apr 2017 10:20:53 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CjL+he25"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932737AbdCaXUw (ORCPT ); Fri, 31 Mar 2017 19:20:52 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:33672 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753986AbdCaXUv (ORCPT ); Fri, 31 Mar 2017 19:20:51 -0400 Received: by mail-qk0-f196.google.com with SMTP id p22so12346599qka.0 for ; Fri, 31 Mar 2017 16:20:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=V7wr9EsQPHNQA8U2MrIVwhS4YiKkiU5XJC4zJ8OwFhU=; b=CjL+he25Jjv/ELn5r4DA21KJg5byuJPOdVjRMTpqSHfaTvyPgjy4uuPdI9wEumpz5G hhnth6ph4VGE62Bnmo9d/kchL9MSisJCmRjB7RllB/jK7gWnO5h8elCHjO94q8JkjZQw 9qHY5gfkSNE9sioJ14WUFanXbtuXpGeXSHXkpOUcCPPAJl1v9esF0xM8WrX4Jutk98aF +lAcahVETCSP1c7urjp36G8cX+vdlM/0HXpvRxejQbUT+288W9AH/KkwpIWLJ3qA9iA8 jkD1+grO1jeiFkV1TEUD8tRYfh9CCQvzguLEwhvB215hFngejTQWkhNLLwhi+IdiVp+4 XPMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=V7wr9EsQPHNQA8U2MrIVwhS4YiKkiU5XJC4zJ8OwFhU=; b=jxeVBZ7aMO6gHfP7LaDxeKD4LvARBhRGStNZt+9Gb7y/1bXDnxSMhxCLEUrgZmsctA yEUNffCu+zDmMjP9zLalXU9kdmnV2eDfz2qKLrbT9vuHeZb81LylNKULP0iZjzpuIVAL cs603w2Ocnn6XdAvr7kEXsQSCESQBqHIZvXUno9MjTVjXEiAWJsV1bTySkjZdAKudErE dokYumWQjynkx+7KFnn/vXlwZ6e5sY1586FLL2sEyzhs77pjxC8MIh9j3H6VKh9il5Oy VCdqco1nF0vObE8SjDF67312NmUmcneWam40BneZjQJ9REPci7yv+dl2AqKWkgy5ZbJF mMfg== X-Gm-Message-State: AFeK/H0IhZ21wxqNnDfqmBmmp6/+ruL/ev1g9mk/so+kCcn1u4yU0wNwaQte/R8NP453HA== X-Received: by 10.55.4.139 with SMTP id 133mr5005991qke.256.1491002450560; Fri, 31 Mar 2017 16:20:50 -0700 (PDT) Received: from localhost.localdomain (c-73-60-235-182.hsd1.nh.comcast.net. [73.60.235.182]) by smtp.gmail.com with ESMTPSA id c6sm4567471qte.30.2017.03.31.16.20.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Mar 2017 16:20:50 -0700 (PDT) Date: Fri, 31 Mar 2017 19:21:59 -0400 From: Eric Whitney To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu Subject: [PATCH] e2fsck: fix type mismatches in quota warning message Message-ID: <20170331232159.GA12986@localhost.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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 --- lib/support/mkquota.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c index 8629266..1bb43a7 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) {