From patchwork Fri Oct 9 12:12:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7361251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E207DBEEA4 for ; Fri, 9 Oct 2015 12:15:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B16520860 for ; Fri, 9 Oct 2015 12:15:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 102702084F for ; Fri, 9 Oct 2015 12:15:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZkWXo-0007W8-Je; Fri, 09 Oct 2015 12:13:04 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZkWXl-0007Ru-UH for linux-arm-kernel@lists.infradead.org; Fri, 09 Oct 2015 12:13:02 +0000 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0Mh6vJ-1ZxX6q30pF-00MMY9; Fri, 09 Oct 2015 14:12:37 +0200 From: Arnd Bergmann To: Neil Brown Subject: [PATCH] md: fix 32-bit build warning Date: Fri, 09 Oct 2015 14:12:36 +0200 Message-ID: <5304496.D8N6u074t0@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:+amGVj3n6QyJLDz1XR4kH65Oo+z+RmI2HCUgkgXls4JSepQylFL wUhnfAGwu4Ew/tp7OZJ+Wo6cQGAReuGk/WtapO1C9DQczXqVzvUo/dBmBPTdDbpygb1imYO vtz/gZ76Cbq8DV0MZEVATopV1yvvMy0ecloc3cC4Lx8sXxE1FxaRutA8176hZ58QSRn8PA5 rRGofilqHp661YHdVQBXA== X-UI-Out-Filterresults: notjunk:1; V01:K0:hptK/BNTyDI=:GXn1R+fsADISbgULEelx01 lmKkVyZ502Sx0iOHCRmyV0wN7U5kxlwCkfH4Osp5ZH/Dd0v0YQizk+m8q2Hp/0RdWjUU3VKOr wUMn8JjhakDAEKgPAhwzzq7k2wQrxy8wqfHhKjB29/t7b8KIvO8FEptAYfxAgpy3OXCR4up+u A9YVpasIQZCQBTQsmYlUIwfN1/R/ByJOyyw/q5TSImAhnpJOJyEa0vWPHLhVPuikvjo92Iqpw shW9gENNw89n83h9HiKq9rLgQ2vdbL02S2eNIdEUDUS/43vnCLJP5o+EjFy2gM9foGjWXYw1w V3H+ZZx2cwjm3iS5eRvTcA2jVM2kr4Uyd6RqsV6+uClwIt6FfQRRO4Y7imt9z30roZfSCFemH ReKpskqACWZdTM85yT2ptGIvqJ5LgjZ62rXEYQwYtuxvoRTtIKabdgSIvoYN9XuIPvr8ZGmyZ nNrjHTEe7ESM5xeX9DxLnFFUezqbmJQxSXB4IlpMOeUOfr7SHXP+RPwsTIriW4mKnotBx3L0F NfKAOtFcZh0zP7imj08/IaxIJcw3CVhCF9d6bAd7dSBoXPXs+B1MRemxREbxNSlehGvEO00Bx lNAUVSXLxRjregXdm+aJmTD802bouR7ZErn+FA7Hzqa43sjbL2/WIgz0L0dsawnCNe4gvuX4Y sH29CCk+ff4bB7J+LC/UMZL4HBaYLbBNqF1VozVa/u9InDjhA/Bn/z32bJfCy6ipsyAaXhgrM qXKgn4H1DQILMItf X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151009_051302_224926_7BFD6B65 X-CRM114-Status: GOOD ( 15.95 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, Goldwyn Rodrigues , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 32-bit architectures, the md code produces this warning when CONFIG_LDAF is set: drivers/md/md.c: In function 'check_sb_changes': drivers/md/md.c:8990:10: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'sector_t {aka long long unsigned int}' [-Wformat=] pr_info("%s:%d recovery_cp changed from %lu to %lu\n", __func__, The code was only recently introduced, and uses the wrong format string for sector_t. As a workaround, this patch adds an explicit cast to 'u64' so we can use the %llu format string on all architectures. Signed-off-by: Arnd Bergmann Fixes: e0212320066e ("md-cluster: Improve md_reload_sb to be less error prone") Cc: Goldwyn Rodrigues --- I also noticed that some commmits in md/for-next including the one causing the problem lack a Signed-off-by line. It might make sense to just fold this patch and add the lines at the same time. diff --git a/drivers/md/md.c b/drivers/md/md.c index 7fff1e6884d6..e13f72a3b561 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -8987,9 +8987,9 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev) /* recovery_cp changed */ if (le64_to_cpu(sb->resync_offset) != mddev->recovery_cp) { - pr_info("%s:%d recovery_cp changed from %lu to %lu\n", __func__, - __LINE__, mddev->recovery_cp, - (unsigned long) le64_to_cpu(sb->resync_offset)); + pr_info("%s:%d recovery_cp changed from %llu to %llu\n", __func__, + __LINE__, (u64)mddev->recovery_cp, + (u64) le64_to_cpu(sb->resync_offset)); mddev->recovery_cp = le64_to_cpu(sb->resync_offset); }