Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp1549779imm; Tue, 15 May 2018 22:45:36 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqUUUh7kqgHsaELiqf20r82e5/EtS8K47BNtvpVooSEqvZaPSzfR2xx2RILaqVxviElefhF X-Received: by 2002:a17:902:548f:: with SMTP id e15-v6mr18160813pli.314.1526449536216; Tue, 15 May 2018 22:45:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526449536; cv=none; d=google.com; s=arc-20160816; b=F7BSAGflAIMsQffB/V1RBbejxi1wwZiXoHX/jWW3ix803RhEr6+Pru4En5QaNa1eAo AOY3RDV0lbvrvwFL35Qby6wE15ZWLPuipHzX6xAnYrb01N5YBRRzojiSzHJdGQTK/iYS kWnLMFdoqvpBKh82O+n2c+/PLxGj+idmVA1TfALp0S9MzFdZOK7KkvN8i+svUTiIADLD jQIRgtV+BzJA2strnKkyDhitsowzlb7vivu1OI47MFKMQVuJrRqhryMt4V8LN/KU6XLN 9Y+oPzwYzhjOjqTKoMGmUW+pSyTCU6kd06kcpp0hu07dqvHmGV0Bh7onMcsAyAHoLL93 tBWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=vhxooW2o+3RSxmyW2STDwGcsjlq1JaJC0TecWjdJUGc=; b=zhnQhfTqhsRUE+xhVdeU2CPMYnRQ08F6LwRWcjkYX5uJOTUAI08EkVIokB7JdECLEs dABURYHhP8sDVu4iRFQKDGWQMZ1DvcURhcfNqPkskEF7bX/erZpO2tx1QJZ/tRf0MRxE at5/w4asCZqoPZLZQWs2e80RuCVUAYkgQ+OWHMosDfcvNSlTUWnzoXxW6a39R8eB43F8 dC4AyLQC46x9fYjsySkL4cgLS0eJpEEYq5N8iAXKiub1AS7wU+n+gU65uPKkxr2sL+WY 8o8e7wsE4DrtE0Z+6B3ZTKegziyb8wT+u5cPVgLff33tt+YrvLCqqtNsNptS0V5F0Kkl beVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=fsAP7kau; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d20-v6si1946538plr.206.2018.05.15.22.45.22; Tue, 15 May 2018 22:45:36 -0700 (PDT) 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; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=fsAP7kau; 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 S1752500AbeEPFoa (ORCPT + 99 others); Wed, 16 May 2018 01:44:30 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:57400 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752431AbeEPFo1 (ORCPT ); Wed, 16 May 2018 01:44:27 -0400 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 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); -- 2.17.0