From patchwork Wed Jun 8 12:31:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9164473 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0A7B560572 for ; Wed, 8 Jun 2016 12:31:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFADF27248 for ; Wed, 8 Jun 2016 12:31:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E36B527BE5; Wed, 8 Jun 2016 12:31:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0A5628179 for ; Wed, 8 Jun 2016 12:31:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425131AbcFHMbc (ORCPT ); Wed, 8 Jun 2016 08:31:32 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:52600 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423697AbcFHMbb (ORCPT ); Wed, 8 Jun 2016 08:31:31 -0400 Received: from [83.175.99.196] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAcdu-0000DL-C3; Wed, 08 Jun 2016 12:31:30 +0000 From: Christoph Hellwig To: keith.busch@intel.com, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, sagi@lightbits.io, ming.l@ssi.samsung.com Subject: [PATCH 07/11] nvmet: fix 64-bit division in nvmet_set_features Date: Wed, 8 Jun 2016 14:31:02 +0200 Message-Id: <1465389066-19119-8-git-send-email-hch@lst.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465389066-19119-1-git-send-email-hch@lst.de> References: <1465389066-19119-1-git-send-email-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As it makes 32-bit builds unhappy. Signed-off-by: Christoph Hellwig Reviewed-by: Sagi Grimberg --- drivers/nvme/target/admin-cmd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index 240e323..2fac17a 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -298,6 +298,7 @@ static void nvmet_execute_set_features(struct nvmet_req *req) struct nvmet_subsys *subsys = req->sq->ctrl->subsys; u32 cdw10 = le32_to_cpu(req->cmd->common.cdw10[0]); u64 val; + u32 val32; u16 status = 0; switch (cdw10 & 0xf) { @@ -307,7 +308,8 @@ static void nvmet_execute_set_features(struct nvmet_req *req) break; case NVME_FEAT_KATO: val = le64_to_cpu(req->cmd->prop_set.value); - req->sq->ctrl->kato = (u32)DIV_ROUND_UP(val & 0xffff, 1000); + val32 = val & 0xffff; + req->sq->ctrl->kato = DIV_ROUND_UP(val32, 1000); nvmet_set_result(req, req->sq->ctrl->kato); break; default: