From patchwork Wed Apr 17 01:27:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruan Shiyang X-Patchwork-Id: 10904309 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 5437A161F for ; Wed, 17 Apr 2019 01:27:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D0EA28A20 for ; Wed, 17 Apr 2019 01:27:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 311BF28A26; Wed, 17 Apr 2019 01:27: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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable 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 E45F228A20 for ; Wed, 17 Apr 2019 01:27:31 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CF58621945DC7; Tue, 16 Apr 2019 18:27:30 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: None (no SPF record) identity=mailfrom; client-ip=183.91.158.132; helo=heian.cn.fujitsu.com; envelope-from=ruansy.fnst@cn.fujitsu.com; receiver=linux-nvdimm@lists.01.org Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by ml01.01.org (Postfix) with ESMTP id CD30F2194EB76 for ; Tue, 16 Apr 2019 18:27:29 -0700 (PDT) X-IronPort-AV: E=Sophos;i="5.60,359,1549900800"; d="scan'208";a="59482920" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 17 Apr 2019 09:27:25 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 140904CD80E1; Wed, 17 Apr 2019 09:27:25 +0800 (CST) Received: from iridescent.g08.fujitsu.local (10.167.225.140) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 17 Apr 2019 09:27:28 +0800 From: Shiyang Ruan To: , Subject: [RFC PATCH 2/4] fs/xfs: iomap: add handle for reflink in fsdax mode Date: Wed, 17 Apr 2019 09:27:13 +0800 Message-ID: <20190417012715.8287-3-ruansy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190417012715.8287-1-ruansy.fnst@cn.fujitsu.com> References: <20190417012715.8287-1-ruansy.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.225.140] X-yoursite-MailScanner-ID: 140904CD80E1.A3A5F X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: ruansy.fnst@cn.fujitsu.com 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: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP xfs_file_iomap_begin() is supposed to allocate new extents for reflinked inode and pass the source blocks' start address to the actor functions. Signed-off-by: Shiyang Ruan --- fs/xfs/xfs_iomap.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 63d323916bba..a45b4e5a1d87 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c @@ -255,7 +255,11 @@ xfs_iomap_write_direct( * left but we need to do unwritten extent conversion. */ if (IS_DAX(VFS_I(ip))) { - bmapi_flags = XFS_BMAPI_CONVERT | XFS_BMAPI_ZERO; + if (xfs_is_cow_inode(ip)) + /* we need to allocate new extents for reflink */ + bmapi_flags = XFS_BMAPI_COWFORK; + else + bmapi_flags = XFS_BMAPI_CONVERT | XFS_BMAPI_ZERO; if (imap->br_state == XFS_EXT_UNWRITTEN) { tflags |= XFS_TRANS_RESERVE; resblks = XFS_DIOSTRAT_SPACE_RES(mp, 0) << 1; @@ -983,7 +987,8 @@ xfs_file_iomap_begin( */ if (xfs_is_cow_inode(ip)) { struct xfs_bmbt_irec cmap; - bool directio = (flags & IOMAP_DIRECT); + bool convert = (flags & IOMAP_DIRECT) + || IS_DAX(inode); /* if zeroing doesn't need COW allocation, then we are done. */ if ((flags & IOMAP_ZERO) && @@ -993,10 +998,16 @@ xfs_file_iomap_begin( /* may drop and re-acquire the ilock */ cmap = imap; error = xfs_reflink_allocate_cow(ip, &cmap, &shared, &lockmode, - directio); + convert); if (error) goto out_unlock; + if (shared && IS_DAX(inode)) { + /* get source address and pass it to actor functions */ + iomap->src_addr = BBTOB(xfs_fsb_to_db(ip, + imap.br_startblock)); + } + /* * For buffered writes we need to report the address of the * previous block (if there was any) so that the higher level @@ -1005,8 +1016,9 @@ xfs_file_iomap_begin( * I/O, which must be block aligned, we need to report the * newly allocated address. If the data fork has a hole, copy * the COW fork mapping to avoid allocating to the data fork. + * If is DAX, we need to allocate new address. */ - if (directio || imap.br_startblock == HOLESTARTBLOCK) + if (convert || imap.br_startblock == HOLESTARTBLOCK) imap = cmap; end_fsb = imap.br_startoff + imap.br_blockcount;