From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753688AbbJIMNL (ORCPT ); Fri, 9 Oct 2015 08:13:11 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:62413 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752902AbbJIMNJ (ORCPT ); Fri, 9 Oct 2015 08:13:09 -0400 From: Arnd Bergmann To: Neil Brown Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, Goldwyn Rodrigues , linux-arm-kernel@lists.infradead.org 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 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); }