From patchwork Mon Aug 28 06:36:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 9924201 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 3105660311 for ; Mon, 28 Aug 2017 06:37:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20D4B28673 for ; Mon, 28 Aug 2017 06:37:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1581D28680; Mon, 28 Aug 2017 06:37:11 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 A26FF28673 for ; Mon, 28 Aug 2017 06:37:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750830AbdH1GhK (ORCPT ); Mon, 28 Aug 2017 02:37:10 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:55253 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750735AbdH1GhJ (ORCPT ); Mon, 28 Aug 2017 02:37:09 -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=aSZSY9E8s06RxZCDRgV/VZBI3qEhPeN1TvM7MudSWag=; b=Q5uMPBovwE7xZ6cTxoE+v92tE ID75AFWmIkjiyCfUwlVRRRKWqsGt3RiOYGOn4U+Bd950IOgunOQhbZzV2cQuIvACkitGmArQvJ2ev GuWZsLE5rCjExA5hYHDOXPwBUkNaf4cflP0V+37A5BQecRYphdMBlscu88abam9K9FE3OVaslikOl c5m2ExqFZrkYXsXI7UIaIj7/9KdvbM6e7uJiFl57xL84GLqOBDem0lnwfKvEByi2yr2t2gyumQIG2 iBkaZsx/d7xSPgfkx2Oa/v+iMUqXVQmbzmPx34ICELYnXbvJa561+6GQoL4QvWHNSxH4dDMoIvHZx I5a+94HwA==; Received: from 77.117.146.174.wireless.dyn.drei.com ([77.117.146.174] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dmDfY-0001pG-KA; Mon, 28 Aug 2017 06:37:09 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: jack@suse.cz Subject: [PATCH 1/2] iomap: return VM_FAULT_* codes from iomap_page_mkwrite Date: Mon, 28 Aug 2017 08:36:58 +0200 Message-Id: <20170828063659.21045-2-hch@lst.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170828063659.21045-1-hch@lst.de> References: <20170828063659.21045-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-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP All callers will need the VM_FAULT_* flags, so convert in the helper. Signed-off-by: Christoph Hellwig Reviewed-by: Ross Zwisler Reviewed-by: Darrick J. Wong --- fs/iomap.c | 4 ++-- fs/xfs/xfs_file.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/iomap.c b/fs/iomap.c index 59cc98ad7577..8554a8d75281 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -477,10 +477,10 @@ int iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops) set_page_dirty(page); wait_for_stable_page(page); - return 0; + return VM_FAULT_LOCKED; out_unlock: unlock_page(page); - return ret; + return block_page_mkwrite_return(ret); } EXPORT_SYMBOL_GPL(iomap_page_mkwrite); diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index c4893e226fd8..8b0181c6d2a6 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -1035,7 +1035,6 @@ xfs_filemap_page_mkwrite( ret = dax_iomap_fault(vmf, PE_SIZE_PTE, &xfs_iomap_ops); } else { ret = iomap_page_mkwrite(vmf, &xfs_iomap_ops); - ret = block_page_mkwrite_return(ret); } xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED);