From patchwork Fri Mar 4 23:49:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102606 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp345146lbc; Fri, 4 Mar 2016 15:50:14 -0800 (PST) X-Received: by 10.98.17.26 with SMTP id z26mr16187804pfi.30.1457135411161; Fri, 04 Mar 2016 15:50:11 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 22si8851787pfq.57.2016.03.04.15.50.10; Fri, 04 Mar 2016 15:50:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760531AbcCDXuG (ORCPT + 30 others); Fri, 4 Mar 2016 18:50:06 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:63626 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759633AbcCDXuF (ORCPT ); Fri, 4 Mar 2016 18:50:05 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0LdVQI-1aBDFJ472g-00ijr6; Sat, 05 Mar 2016 00:49:40 +0100 From: Arnd Bergmann To: Jens Axboe , Markus Pargmann Cc: Arnd Bergmann , nbd-general@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH] nbd: use correct div_s64 helper Date: Sat, 5 Mar 2016 00:49:31 +0100 Message-Id: <1457135375-1787628-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:zDPWjV2izgl9eNY/SvOqbuSTnSVmNYom8P9cfMzyQwMbwM/Ydjh 244kZetstZRhhg+8vUwLP1qu6izfmILcatjCiqvMLOtvPqrC9irU8uhMizfeEFJojcDSXfs v5i2E+afG69MS4raiML6EDCVdPwtzkK6kJlTE4gdVJI+u8RyJwKDk17+CGyA0fFYYGw9bEe Ib0yAPr8nujdD+/LlATww== X-UI-Out-Filterresults: notjunk:1; V01:K0:g7j+z2q7u78=:+5bHufbdmJOb46Jw5gXuTP gnum3Zl93lJH+XyfuGroECHT+Bxc8/zdF7fd57bmbzAh6EFuWO5uu58k5qJo13fCFklb6rIGC tgxBDSLYF491orzyY1bAt+viWUfQ5WykHYulvhomD5LjO9osFAnnKncyWQ3pjf2CxFwXB4qDl UTc5xPRFp1hxlZIL3KVu8FARxEAOeojtQEvWS26pCv/AtjIk6QjtpikNAhR5UK2FFPjg4I6ka zPodc/60+AarA6wiumUxXTNSE33YmQy7p35sttzPDoEs0IkbnMmKqE+3JUamAPvG0UO8KK/gL ZpS0g10cElhrdIHXMoJJj1Oit7i1nOkXjLf7nuffFhMIaRBzLDuJNYlUupSgdnfS9EUjVInHl 5kEqZ2092pJGZCUVkKoTacEeHv7oVjCkDkgQ8TFnI3MQaPjYNUjnFxCmqc+tsBgx621mBE8QV dKuhLLI6xhJObrMMcCY7jX8R+UfmuuERbwMU+paocBLE1mE0tkb7RSdn6uddnlsqTzzEYG/QD fw73bYblF+nnH0XFmLM8PgTH6acZDaI4BuTJr6cd8XhFuo4vSgiHrRhozaGA/L/IcW58CuHhp 3z9JRLHJne86Tq5f8oL1JPw13Dx63A/y/gMYvOSQ2ev3dbq9KJPM9la28BihupraNHUUK5F+e +Ok9+8F8U03HvvkdWwwo72yoYaJL4AnbtXeZAtMWJWcRvg10BOJwDh/78ob3nFY82mWk= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The do_div() macro now checks its arguments for the correct type, and refuses anything other than u64, so we get a warning about nbd_ioctl passing in an loff_t: drivers/block/nbd.c: In function '__nbd_ioctl': drivers/block/nbd.c:757:77: error: comparison of distinct pointer types lacks a cast [-Werror] This changes the nbd code to use div_s64() instead, which takes a signed argument. Signed-off-by: Arnd Bergmann Fixes: 37091fdd831f ("nbd: Create size change events for userspace") --- drivers/block/nbd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.7.0 diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index f6b51d76e578..08afbc7a2bb8 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -753,8 +753,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, } case NBD_SET_BLKSIZE: { - loff_t bsize = nbd->bytesize; - do_div(bsize, arg); + loff_t bsize = div_s64(nbd->bytesize, arg); return nbd_size_set(nbd, bdev, arg, bsize); }