From patchwork Wed Jun 6 12:22:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 925816 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4117996TRSz9rvt; Wed, 6 Jun 2018 22:22:37 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fQXSN-0001ma-RD; Wed, 06 Jun 2018 12:22:27 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fQXSM-0001m4-7w for kernel-team@lists.ubuntu.com; Wed, 06 Jun 2018 12:22:26 +0000 Received: from mail-wm0-f71.google.com ([74.125.82.71]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fQXSM-0004cO-0o for kernel-team@lists.ubuntu.com; Wed, 06 Jun 2018 12:22:26 +0000 Received: by mail-wm0-f71.google.com with SMTP id v5-v6so3006318wmh.6 for ; Wed, 06 Jun 2018 05:22:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=nl+f6J1x1Iu7FUzzodQALJSlYw8GUwcllsnvay05nHk=; b=JOyM0pn0Ki1RKF9P6Nh9HLUXBpRgWxJZ5ZrUVFvGKPn1Z6IX/ZRd6jgzOiFYj8/28Q PELFucC8S04H+i9m5G2b9t846fCnKfqxuLbwKl9HNjMkFphIc1w1zXAyfvqclysmP632 lFOMst6aXAXaSmcm4NEDPEsLabp/MFFR1bZhfRY3P1OehQlHPUT+CupnvsHVeXr8Q/H3 UMjPfNaDDqoBU2dkbp04+l6Wg9mn6U/tuDw+uYODl/JkzcGh2XX8MGgcv0Eh/RpoPy2G WUZmgqImrb8xhiwMkYbgJm5gVIsfv+mKJayaB7+zt6XaFE7uKuSXYeVMy//uLY1kFfJT M4Vw== X-Gm-Message-State: APt69E2q5JPUtYbe+P7ryKRPrV0sosaRiqqzov8I3iV5OF3gp6LJDxWG Mtwe2nmpWnmBOlTj11fbTl2IBed2+2I0NwstIcQtibwSqvY2pxzxwoeW8WQQXNS/X9PNd5qSzPx g4B7ADEBrF7MqLQGjJRUU/BC/BTYRvgL7C5HU+/DVMQ== X-Received: by 2002:a50:83c7:: with SMTP id 65-v6mr3457974edi.248.1528287745620; Wed, 06 Jun 2018 05:22:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJr8Zaxys5BAvXwYUaGGuimJZpzpacfnOxul5CVNiTP1hBlD+tl2irE3mvRC7NlaCe4FGJHfA== X-Received: by 2002:a50:83c7:: with SMTP id 65-v6mr3457960edi.248.1528287745443; Wed, 06 Jun 2018 05:22:25 -0700 (PDT) Received: from gollum.fritz.box ([81.221.205.149]) by smtp.gmail.com with ESMTPSA id q6-v6sm27061508edh.9.2018.06.06.05.22.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jun 2018 05:22:24 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Xenial][PATCH] nbd: fix 64-bit division Date: Wed, 6 Jun 2018 14:22:23 +0200 Message-Id: <20180606122223.29829-1-juergh@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Jens Axboe BugLink: http://bugs.launchpad.net/bugs/1772575 We have this: ERROR: "__aeabi_ldivmod" [drivers/block/nbd.ko] undefined! ERROR: "__divdi3" [drivers/block/nbd.ko] undefined! nbd.c:(.text+0x247c72): undefined reference to `__divdi3' due to a recent commit, that did 64-bit division. Use the proper divider function so that 32-bit compiles don't break. Fixes: ef77b515243b ("nbd: use loff_t for blocksize and nbd_set_size args") Signed-off-by: Jens Axboe (cherry picked from commit e88f72cb9f54f6d244e55f629fe5e2f34ca6f9ed) Signed-off-by: Juerg Haefliger Acked-by: Thadeu Lima de Souza Cascardo Acked-by: Stefan Bader --- drivers/block/nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 673632c301dc..754b6fd9d2f4 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -750,7 +750,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, case NBD_SET_SIZE: return nbd_size_set(nbd, bdev, nbd->blksize, - arg / nbd->blksize); + div_s64(arg, nbd->blksize)); case NBD_SET_SIZE_BLOCKS: return nbd_size_set(nbd, bdev, nbd->blksize, arg);