From patchwork Thu Aug 30 15:38:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10582081 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 54BB75A4 for ; Thu, 30 Aug 2018 15:35:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 427EF2BF00 for ; Thu, 30 Aug 2018 15:35:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 368F52C0A2; Thu, 30 Aug 2018 15:35:15 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B3D7D2C09F for ; Thu, 30 Aug 2018 15:35:14 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 492D42110744D; Thu, 30 Aug 2018 08:35:14 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::541; helo=mail-pg1-x541.google.com; envelope-from=jrdr.linux@gmail.com; receiver=linux-nvdimm@lists.01.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3B90A21107187 for ; Thu, 30 Aug 2018 08:35:13 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id e2-v6so4055122pgv.5 for ; Thu, 30 Aug 2018 08:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=59YJuTd/P3YlkbKgdzoXos1iq41zGzPiWfFh8Oq0dRU=; b=JBypc8TzxvutiL03VLybhPV/L6bqSZZlD1YvMDqb9Afg2MQIDELO9XxZb4vSSDMeg4 JAEEC+QeUTOkBfGFTN8aMkDsCrnHLuCUEWuPfgD6UyET9C7Px4b+B3+txMD4n9zSL2G8 AVe7Qa+ja1xhH5s2q5grXnkhO5smtUxfFpbrcQ6vQDh+HrXfrZqcRHEyqQdaRCZTaTlz 619IqM0J9RinHJveabdfJwloCvV8ED5h62SkR1RlZ0MaRoe64HGn3JiP47vFDJr4C0J+ j3OS1/c/Kt8ucpwOE7fnqofZ7c9l+aIeq8wsdZT7iLrMosJGCMaSs+AeGJfnCUA3oVdo t1hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=59YJuTd/P3YlkbKgdzoXos1iq41zGzPiWfFh8Oq0dRU=; b=PYX7fhJe1gOv+W7cQaR9ZegZdFM3JilTSu/DROP9Kwd89dpcbfpzQ+jqXCs8xewLLm cStXsoGli82/7xCE7JOZFU91iTpHnwZprzmeyYct1BatfZ70iIBpP+sy+mCo8z/ygU4h Gl7gN7Cb8AtVltiG9pHRuYMt2TKgp1NZJZTJY1AoHP9Lho3pszDvKPXbx36t6QCeeQdx EGBc8nfIYV0ZVaJxLNqCMY4ohvOQ4N50GdKPUVLDoTnu/bOXFiH+MQIf9NVkFcOJqrVE xL9qwnWdESucnOXbL7vj2t0yWFYY4fuTLuOnCpAiCRndLkvC/F5+nMQ7ul4f/4bwJeBm JQrQ== X-Gm-Message-State: APzg51BCnFDRfgKCHQcw4xmUgmoDgagLR/RSBLGie1aPjs484Bt8RDbC X3TyUf1cfgD4AelYPXxr7cU= X-Google-Smtp-Source: ANB0VdawHpdM4DWIxbxOzhTXeFXkCe9FfV/jOAILh1e238fm0ycK49thdBEIJZyRSZqhFfAnvMzESQ== X-Received: by 2002:a63:4826:: with SMTP id v38-v6mr10308880pga.379.1535643312759; Thu, 30 Aug 2018 08:35:12 -0700 (PDT) Received: from jordon-HP-15-Notebook-PC ([49.205.216.27]) by smtp.gmail.com with ESMTPSA id 5-v6sm10715816pgc.86.2018.08.30.08.35.10 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Aug 2018 08:35:11 -0700 (PDT) Date: Thu, 30 Aug 2018 21:08:13 +0530 From: Souptick Joarder To: akpm@linux-foundation.org Subject: [PATCH] device-dax: Convert variable to vm_fault_t type Message-ID: <20180830153813.GA26059@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, willy@infradead.org, zwisler@kernel.org Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP As part of commit 226ab561075f ("device-dax: Convert to vmf_insert_mixed and vm_fault_t") in 4.19-rc1, 'rc' was not converted to vm_fault_t. Now converted. Signed-off-by: Souptick Joarder --- drivers/dax/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/dax/device.c b/drivers/dax/device.c index 6fd4608..bbe4d72 100644 --- a/drivers/dax/device.c +++ b/drivers/dax/device.c @@ -392,7 +392,8 @@ static vm_fault_t dev_dax_huge_fault(struct vm_fault *vmf, { struct file *filp = vmf->vma->vm_file; unsigned long fault_size; - int rc, id; + vm_fault_t rc = VM_FAULT_SIGBUS; + int id; pfn_t pfn; struct dev_dax *dev_dax = filp->private_data;