From patchwork Wed May 16 05:43:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10402613 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 70114601F9 for ; Wed, 16 May 2018 05:44:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CEF228733 for ; Wed, 16 May 2018 05:44:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4FFDA28761; Wed, 16 May 2018 05:44: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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBB9B28733 for ; Wed, 16 May 2018 05:44:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB8116B02E9; Wed, 16 May 2018 01:44:30 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A67706B02EA; Wed, 16 May 2018 01:44:30 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97E1C6B02EB; Wed, 16 May 2018 01:44:30 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id 58C636B02E9 for ; Wed, 16 May 2018 01:44:30 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id j14-v6so1888988pfn.11 for ; Tue, 15 May 2018 22:44:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=vhxooW2o+3RSxmyW2STDwGcsjlq1JaJC0TecWjdJUGc=; b=ZObPITKemCtS1m8jxJGEsyK1QGBZSZVDFwW9em/jiE15Mq6Rh8BNe4pfDcr8n4Ym2l 6waSCHQgwyQu1dGbBkfIlY7z6IjAdmNPSjN/Qgqwp8cu63G395xXQEfAPZFykxTD807J TT0q7WKo7bQ2uFFMEQ0z96p0cWwjQWwpQ6YiYNcwTgoOUsL4OJZoKTM56rqFuySJ9tGQ p92SfXrUfBQhUPmV0eNZMplfE2zIMH8xxagsicjxAqvjRlTD8Zibheh0v94E+htNDwyB 0RIXBB+jOsaWg75jQXp6mXaGjHsCc3NcMZkzLp4AOys9H3UQSNbVf/ejdfeku/vs3CtV PhtQ== X-Gm-Message-State: ALKqPwfl57wMrYXgALntj3Z1C08vjjQsupx64JoedT1gv17QLoXbb1XU Ck2+f+MJmo2vJFH/o4dI3mgbWjsMcXfGyQkVRBTvu+sFryiJ2dBhryPmW1/rLzrbPaN73uIYHMZ 32bTCHqUcw82kIU/wbQoH19gJGWY8lM7J3DECFsvGl01tDaudhUsKWVKLkssV0yo= X-Received: by 2002:a17:902:5327:: with SMTP id b36-v6mr18092868pli.316.1526449470070; Tue, 15 May 2018 22:44:30 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrDPs6vmetGb0E8vFuFeKbNR2FWAWdx5cW7HqjVfvx1xWEpfolYxca++hnMvHeUivT2CFDZ X-Received: by 2002:a17:902:5327:: with SMTP id b36-v6mr18092832pli.316.1526449469490; Tue, 15 May 2018 22:44:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526449469; cv=none; d=google.com; s=arc-20160816; b=MlkfT/dJYrUtDtUHgdooLo/zXnuz9ZGq80QDcA7Zd2W8CaGT3iIWoKmBVHBhS5o8F6 tdRGW9hXPDZqwS35b+NMU1MCPxJivHDaCo/0uN7gVpJQkfi88XY15wZ5rUYlwWQPsLLS gC+sH/SFqOEH3RG2nT1CPese7MReXaVr9OoddVKqwMMXDn4Z+WLidc4CKRQIkBlHoY4u iijoDpECG7eM6sbA6m76WbWdLDoQ2SLKUPRPRVeerQ1864DrgWVGcv1fqN+buTaf6evy JvE73pDpZN/Oc5fXIlEGKoYAXx8ws0Vb/v5zC85ErUlQ+mk69V12jTausnRoDgcBSLFZ IlyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=vhxooW2o+3RSxmyW2STDwGcsjlq1JaJC0TecWjdJUGc=; b=fVlAw24Fy/iyuHtcNWRkUX6mD64QzOOIKm9IlxqPKNP4m04HRjJwwEsGttLjYu40Ad pqKg97RXTuznjNjcVfYqEyVKwU4QwRJHVFtc3eLxMPdqDWr7MboucruAejil379Kwba4 5UTp4W28x01fG20g2CZxcBgD7ur4KVMod8eUcG4HBJivf0BKId6Dk0g11iJL7eYySrWS CfYYqUekPFOEGPwDhm5KXeGfF4FIqVGNFt4XgBSddRdhy+nN3SGG/gsq01XWNGbKRDUd nlzks2q+o7NAzknYz1Hsc2O2qHK14UF0kvU239qCMlY6dcOIgWO7pYeAdrK7/fRXs42l xygQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=fsAP7kau; spf=pass (google.com: best guess record for domain of batv+8c5add14d4fec8f33fc9+5379+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+8c5add14d4fec8f33fc9+5379+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id j5-v6si1484542pgs.281.2018.05.15.22.44.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 May 2018 22:44:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+8c5add14d4fec8f33fc9+5379+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=fsAP7kau; spf=pass (google.com: best guess record for domain of batv+8c5add14d4fec8f33fc9+5379+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+8c5add14d4fec8f33fc9+5379+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=vhxooW2o+3RSxmyW2STDwGcsjlq1JaJC0TecWjdJUGc=; b=fsAP7kau/uuxrBje8ItCRe0yU /jKcQcdyO1asOFZY8pOXyc0BlZS+N4zYYWU0oQ0lJpxi4K7aFCyTZ3m/yMNVC38slnbUn+EIZkwu3 MLihHv+1e5be6cJiAMkW6/Fb2NGnEqqTLdq3Sy6+7BMjMkaBxA/c5fM1TCbnWHIbiH4MlLqy0vjMc kV+ybh/Y28HJSLnP1U74p9q5pkfvIUjaFYwe5ZkuV3tYNFGn3+yYSmvg0hN7Wj91clIZxXG7Rc4go ZNaUSoGam4E71ilClgPzpHpBsQ6xhQtENTGMDsqhDYIX025vWnlVaNGISJyC9m5arI5gyJVvCuKm0 Wm/EbLNbw==; Received: from [93.83.86.253] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fIpEH-00080G-LX; Wed, 16 May 2018 05:44:02 +0000 From: Christoph Hellwig To: Souptick Joarder , Matthew Wilcox Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, devel@lists.orangefs.org, ceph-devel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, ocfs2-devel@oss.oracle.com, linux-mtd@lists.infradead.org, dri-devel@lists.freedesktop.org, lustre-devel@lists.lustre.org, linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org Subject: [PATCH 03/14] dax: make the dax_iomap_fault prototype consistent Date: Wed, 16 May 2018 07:43:37 +0200 Message-Id: <20180516054348.15950-4-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180516054348.15950-1-hch@lst.de> References: <20180516054348.15950-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Christoph Hellwig --- include/linux/dax.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/dax.h b/include/linux/dax.h index dc65ece825ee..a292bccdc274 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -183,7 +183,7 @@ void dax_flush(struct dax_device *dax_dev, void *addr, size_t size); ssize_t dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter, const struct iomap_ops *ops); -int dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size, +vm_fault_t dax_iomap_fault(struct vm_fault *vmf, enum page_entry_size pe_size, pfn_t *pfnp, int *errp, const struct iomap_ops *ops); vm_fault_t dax_finish_sync_fault(struct vm_fault *vmf, enum page_entry_size pe_size, pfn_t pfn);