From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934139AbbJIS73 (ORCPT ); Fri, 9 Oct 2015 14:59:29 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:60000 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932132AbbJIS72 (ORCPT ); Fri, 9 Oct 2015 14:59:28 -0400 From: Arnd Bergmann To: Christoph Hellwig Cc: Matthew Wilcox , Jens Axboe , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, Christoph Hellwig Subject: [PATCH v2] nvme: fix 32-bit build warning Date: Fri, 09 Oct 2015 20:58:46 +0200 Message-ID: <6199457.Ih8H4dRbvg@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20151009144221.GA12760@infradead.org> References: <5851501.PBMrs03XFb@wuerfel> <20151009144221.GA12760@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:R49bCUbGxus5Bnn5lepa5raHJY3wWOPWog5BUvZ7pRFwiwT0fK8 zOXZApfe8GhdV1v9mGprUP01fEUfBkPpUb2ddzTqR7PU1B50jeMCozuZzcXgqUImb8E+TR8 khD/tzW8OMlmrLY7hueB+Kbi9CzFp9uDJeVCigsglZNbsHw+f6RW0G+HcpBPlspymn5gdCv V7mQyMPhK04Zucem2ZvJg== X-UI-Out-Filterresults: notjunk:1;V01:K0:iSVdhSJZ6F4=:SFpQA50QCbcceGC0ne9kUN t3ZEoew3upJUzuD6bO0WZgLmX4ndtDXhkPsHCKX9CatLrDdBaCXfXDy0ItkM3mpWEBWiHralG DJRHDRBHkWPQ/gn3Yw4n2Su3IQVDdZUY0KkhbAz32NUc3qCesroj9KxWPegt8Z4jMwif6LIQf S3i3Ss4z5ZEgoEqiUqKo+zvixJReuY14f92EITTJGG9J9DPu7o3Bg4GcnYdfq1DwGxJYvhRmi jTENEHwItx3v5xh3xycsyGeuEbJa9JYw82dSk6c62pF3KIIHwJtsVY87VrTnCvnxyAGZBsZFo VUa/eyNBMEnIAGf8gfdmOlAQL1LfvVs+N1/X+i2KVCPXPxGpjXKVr9aq9GSUXm/gU4Xqq+7WU 3HPyutrFCWyW/m3/1r8Tzo2k1xQKAVk6oKrugtvfQQoxsGh410v7LZ6B4oAOwUs1K9OpK474o tQcgT3JiFnrWrWgEIJRfORjZ+FA70IvC7McDb0W5NnxsvdaTYVuEgaCqS+VEBDPUJXZNaig2n qMfR1Xu/LxdKxz9/iSzFcBctz/NfrqnjVwl1JHfs5duORKSqXfVvTvg4LD6Z61F0jD3Plq1wR kUZUQWPXJY3tSwObdgGdGGt7iNw6fvsuMyeDUqpk5RB78TUrJymExGL3VbVhDiJUxQiNiR0DR s60ULHeaYTrykWXPQDtXXP+p5tRAWcXIqYnTkU7J0oVsETXdD1LJE49P/017h3Ky/6MPt2hqf sDZo8wXkXTyrt5ab Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From 877a323df080bda54a71e26ecf20b4244b31a180 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 6 Oct 2015 22:29:48 +0200 Subject: [PATCH] nvme: fix 32-bit build warning Compiling the nvme driver on 32-bit warns about a cast from a __u64 variable to a pointer: drivers/block/nvme-core.c: In function 'nvme_submit_io': drivers/block/nvme-core.c:1847:4: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] (void __user *)io.addr, length, NULL, 0); The cast here is intentional and safe, so we can shut up the gcc warning by adding an intermediate cast to 'uintptr_t'. I had previously submitted a patch to fix this problem in the nvme driver, but it was accepted on the same day that two new warnings got added. For clarification, I also change the third instance of this cast to use uintptr_t instead of unsigned long now. Signed-off-by: Arnd Bergmann Fixes: d29ec8241c10e ("nvme: submit internal commands through the block layer") --- v2: use uintptr_t for intermediate cast diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index e917cf304ad0..e8ff16c63977 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -1804,7 +1804,7 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) length = (io.nblocks + 1) << ns->lba_shift; meta_len = (io.nblocks + 1) * ns->ms; - metadata = (void __user *)(unsigned long)io.metadata; + metadata = (void __user *)(uintptr_t)io.metadata; write = io.opcode & 1; if (ns->ext) { @@ -1844,7 +1844,7 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio) c.rw.metadata = cpu_to_le64(meta_dma); status = __nvme_submit_sync_cmd(ns->queue, &c, NULL, - (void __user *)io.addr, length, NULL, 0); + (void __user *)(uintptr_t)io.addr, length, NULL, 0); unmap: if (meta) { if (status == NVME_SC_SUCCESS && !write) { @@ -1886,7 +1886,7 @@ static int nvme_user_cmd(struct nvme_dev *dev, struct nvme_ns *ns, timeout = msecs_to_jiffies(cmd.timeout_ms); status = __nvme_submit_sync_cmd(ns ? ns->queue : dev->admin_q, &c, - NULL, (void __user *)cmd.addr, cmd.data_len, + NULL, (void __user *)(uintptr_t)cmd.addr, cmd.data_len, &cmd.result, timeout); if (status >= 0) { if (put_user(cmd.result, &ucmd->result))