From patchwork Sat Oct 13 00:08:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10639691 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 F0FA05CAF for ; Sat, 13 Oct 2018 00:08:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD31B2B096 for ; Sat, 13 Oct 2018 00:08:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D09552B877; Sat, 13 Oct 2018 00:08:26 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY 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 316312B096 for ; Sat, 13 Oct 2018 00:08:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 606DD6B028C; Fri, 12 Oct 2018 20:08:24 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5B72C6B028E; Fri, 12 Oct 2018 20:08:24 -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 40AF76B028F; Fri, 12 Oct 2018 20:08:24 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id F15FA6B028C for ; Fri, 12 Oct 2018 20:08:23 -0400 (EDT) Received: by mail-pl1-f199.google.com with SMTP id ba5-v6so6700397plb.17 for ; Fri, 12 Oct 2018 17:08:23 -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:subject:from:to:cc:date :message-id:in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=hIKY9nQiwanIV2qW41QCGIkoUmtm4iR8ODVGIx3BUpQ=; b=K8kK1jX6I336bIiitwELmy6dtITWojrvxGqpG1A/R47X1ZZiQWFWL1cUPed/PHCfSw NrRjR16CzVSApV1c91ofM5UT8EEsMCGE+g7wTm3lDi3aXwrPQsktfaiwyvg4qJCZNJ8w 0DeOHirF9hs4jB/YT9ARVq4u30MKdKPKTxuEoPV2SEFybx3Ymb1OwM99fcTZKUh1+JBS gEEujqhig6p7yoRDevWMbdGZp95UTszY3XblLX7SjdmSwgBvgEc6mYPsW0VvkMOJir+0 gOn39uY72nsHUGTkg2fXxWmrjXEAjgfzxBX8LKnASUfnxQ7taADisMVLarXCdAMC01zS wVtQ== X-Gm-Message-State: ABuFfogH63QWWHGMXPoj0hMiyOtaZR/jP3P2wOxyeM2HdKZiLOQpogTB lhaUbVPbHJupYqioB+gD+nRMgXdWQLCTZ5OavPhIeptTnWygrPqcHum3jnzscAa2kiyV4yfWCac 0fTUnuRPrpCaDocGp5F0/TXTgVMPOVQjpGezlmcE+xOanhAi7kMn2bvL9/ofIO15/pA== X-Received: by 2002:a63:cc51:: with SMTP id q17-v6mr7302674pgi.291.1539389303644; Fri, 12 Oct 2018 17:08:23 -0700 (PDT) X-Google-Smtp-Source: ACcGV62u3tedx6unpRvtdF1bCa8mnN7seKFXv1egz3XNTUxmmrbUwB2Xf/tuY+FTAL7wj0OJF4BK X-Received: by 2002:a63:cc51:: with SMTP id q17-v6mr7302631pgi.291.1539389302758; Fri, 12 Oct 2018 17:08:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539389302; cv=none; d=google.com; s=arc-20160816; b=dTljJeApMtVj28QjDIgQxWP4JkmkjLbHsejWo+/WQAaJ4eXvV9Axq0hK+efmgIGzYR eNg82y3HaP/RZyK7EpIiVRL5DqMlWG0dM1YUDC9owUxp9YVXXjfI3i6VblsARouYHSbE TRGA8W/kq9It8ZOCJXzsBzMT7U9dU1cbbEU7S50r2HAxPLNWl7LCsfCgl52WitH8GRBc DITZBLNFVFImQnKHxA62lR5TKdNjcRYf16TGN0bZskgtfx3bGiaHHnnOrfoWplvagTMk RiC/hsQK9n4GRfiMDleux7EAmtnmv5hmUrpz1UlDkuufNi2kvNY/0Iaz4t9vKNn6UMfd WRfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject:dkim-signature; bh=hIKY9nQiwanIV2qW41QCGIkoUmtm4iR8ODVGIx3BUpQ=; b=z/0kMBQ2PPPxVHE1Lz4XfANyc95htBJwQxjAcjYnpX1nP3oINQVtw609HcKD5j7Knm S3FD4HO/gQ6WPzhUaXnAegxSN1jdRAOq4h86e/5nJF92Cxfjt/BR07XWXdV8ol4RqHIE ttb2tl4YnLAveCDcxvjOKIjupvvPrakAekv+iW9cDyj+tE/gMyk7JJXrXZYUOLfigq97 juJvqo4zFsfg6euRDjrGztCLt5sSYwI50/uRrOL4t3NGDiSdUJXdfPjLR4cxiE4elc2f L2jfNPPExnEPZt/Bxk7zK2RRhYIwvyZuE5Xj962xU/cTjSplR0+QiH7DJvj9mmZWnGAc LNGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=ceoQ1LPJ; spf=pass (google.com: domain of darrick.wong@oracle.com designates 141.146.126.78 as permitted sender) smtp.mailfrom=darrick.wong@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from aserp2120.oracle.com (aserp2120.oracle.com. [141.146.126.78]) by mx.google.com with ESMTPS id w134-v6si2918841pfd.55.2018.10.12.17.08.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Oct 2018 17:08:22 -0700 (PDT) Received-SPF: pass (google.com: domain of darrick.wong@oracle.com designates 141.146.126.78 as permitted sender) client-ip=141.146.126.78; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=ceoQ1LPJ; spf=pass (google.com: domain of darrick.wong@oracle.com designates 141.146.126.78 as permitted sender) smtp.mailfrom=darrick.wong@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9D04BYe163285; Sat, 13 Oct 2018 00:08:21 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=hIKY9nQiwanIV2qW41QCGIkoUmtm4iR8ODVGIx3BUpQ=; b=ceoQ1LPJ/ELuYN8RPNeSJhGR5K+aHXwAUH9O+ILkxywvD/aett6Qy+U9mNQFOgekKpdI W/WBanLSyjYGmPGflshc8OvVxBQpQ9vaFTnDfQaeg25Um1YkIlmkb5X3NyhnSDCsI3MU dpLXz+ijILrKEE6kmzz3VZr6Q09suQGWc5PiO+1MfN7h0hOfGHk89RYB2cYV+opRyTZK DgGL4TtrxrCKsLiJaSBqcHGTuIjawb9H436lejtxPT4HWc572XKb9KPNI5EhwnuqFRH1 fX8HG6kvo8j59QIPNWekPPBESygWhDnTHF04Muk/AzXKueT0nOHBJ9OBKN+4dJbS5Bbs vA== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2120.oracle.com with ESMTP id 2mxn0qnmj4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 13 Oct 2018 00:08:21 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9D08KJM005499 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 13 Oct 2018 00:08:20 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w9D08KtU020123; Sat, 13 Oct 2018 00:08:20 GMT Received: from localhost (/10.159.251.254) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 13 Oct 2018 00:08:19 +0000 Subject: [PATCH 22/25] ocfs2: support partial clone range and dedupe range From: "Darrick J. Wong" To: david@fromorbit.com, darrick.wong@oracle.com Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com Date: Fri, 12 Oct 2018 17:08:18 -0700 Message-ID: <153938929813.8361.16702022670128567518.stgit@magnolia> In-Reply-To: <153938912912.8361.13446310416406388958.stgit@magnolia> References: <153938912912.8361.13446310416406388958.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9044 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810130000 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 From: Darrick J. Wong Change the ocfs2 remap code to allow for returning partial results. Signed-off-by: Darrick J. Wong --- fs/ocfs2/file.c | 7 +---- fs/ocfs2/refcounttree.c | 73 ++++++++++++++++++++++++++--------------------- fs/ocfs2/refcounttree.h | 12 ++++---- 3 files changed, 48 insertions(+), 44 deletions(-) diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index e6ffed70398e..061ae2c4bd4a 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2531,14 +2531,11 @@ static loff_t ocfs2_remap_file_range(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, loff_t len, unsigned int remap_flags) { - int ret; - if (!remap_check_flags(remap_flags, RFR_SAME_DATA)) return -EINVAL; - ret = ocfs2_reflink_remap_range(file_in, pos_in, file_out, pos_out, - len, remap_flags); - return ret < 0 ? ret : len; + return ocfs2_reflink_remap_range(file_in, pos_in, file_out, pos_out, + len, remap_flags); } const struct inode_operations ocfs2_file_iops = { diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index b9e0418a1974..4eacdd703874 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c @@ -4507,14 +4507,14 @@ static int ocfs2_reflink_update_dest(struct inode *dest, } /* Remap the range pos_in:len in s_inode to pos_out:len in t_inode. */ -static int ocfs2_reflink_remap_extent(struct inode *s_inode, - struct buffer_head *s_bh, - loff_t pos_in, - struct inode *t_inode, - struct buffer_head *t_bh, - loff_t pos_out, - loff_t len, - struct ocfs2_cached_dealloc_ctxt *dealloc) +static loff_t ocfs2_reflink_remap_extent(struct inode *s_inode, + struct buffer_head *s_bh, + loff_t pos_in, + struct inode *t_inode, + struct buffer_head *t_bh, + loff_t pos_out, + loff_t len, + struct ocfs2_cached_dealloc_ctxt *dealloc) { struct ocfs2_extent_tree s_et; struct ocfs2_extent_tree t_et; @@ -4522,6 +4522,7 @@ static int ocfs2_reflink_remap_extent(struct inode *s_inode, struct buffer_head *ref_root_bh = NULL; struct ocfs2_refcount_tree *ref_tree; struct ocfs2_super *osb; + loff_t remapped = 0; loff_t pstart, plen; u32 p_cluster, num_clusters, slast, spos, tpos; unsigned int ext_flags; @@ -4605,30 +4606,32 @@ static int ocfs2_reflink_remap_extent(struct inode *s_inode, next_loop: spos += num_clusters; tpos += num_clusters; + remapped += ocfs2_clusters_to_bytes(t_inode->i_sb, + num_clusters); } -out: - return ret; + return remapped; out_unlock_refcount: ocfs2_unlock_refcount_tree(osb, ref_tree, 1); brelse(ref_root_bh); - return ret; +out: + return remapped > 0 ? remapped : ret; } /* Set up refcount tree and remap s_inode to t_inode. */ -static int ocfs2_reflink_remap_blocks(struct inode *s_inode, - struct buffer_head *s_bh, - loff_t pos_in, - struct inode *t_inode, - struct buffer_head *t_bh, - loff_t pos_out, - loff_t len) +static loff_t ocfs2_reflink_remap_blocks(struct inode *s_inode, + struct buffer_head *s_bh, + loff_t pos_in, + struct inode *t_inode, + struct buffer_head *t_bh, + loff_t pos_out, + loff_t len) { struct ocfs2_cached_dealloc_ctxt dealloc; struct ocfs2_super *osb; struct ocfs2_dinode *dis; struct ocfs2_dinode *dit; - int ret; + loff_t ret; osb = OCFS2_SB(s_inode->i_sb); dis = (struct ocfs2_dinode *)s_bh->b_data; @@ -4700,7 +4703,7 @@ static int ocfs2_reflink_remap_blocks(struct inode *s_inode, /* Actually remap extents now. */ ret = ocfs2_reflink_remap_extent(s_inode, s_bh, pos_in, t_inode, t_bh, pos_out, len, &dealloc); - if (ret) { + if (ret < 0) { mlog_errno(ret); goto out; } @@ -4820,18 +4823,19 @@ static void ocfs2_reflink_inodes_unlock(struct inode *s_inode, } /* Link a range of blocks from one file to another. */ -int ocfs2_reflink_remap_range(struct file *file_in, - loff_t pos_in, - struct file *file_out, - loff_t pos_out, - loff_t len, - unsigned int remap_flags) +loff_t ocfs2_reflink_remap_range(struct file *file_in, + loff_t pos_in, + struct file *file_out, + loff_t pos_out, + loff_t len, + unsigned int remap_flags) { struct inode *inode_in = file_inode(file_in); struct inode *inode_out = file_inode(file_out); struct ocfs2_super *osb = OCFS2_SB(inode_in->i_sb); struct buffer_head *in_bh = NULL, *out_bh = NULL; bool same_inode = (inode_in == inode_out); + loff_t remapped = 0; ssize_t ret; if (!ocfs2_refcount_tree(osb)) @@ -4855,6 +4859,11 @@ int ocfs2_reflink_remap_range(struct file *file_in, if (ret <= 0) goto out_unlock; + if (len == 0) { + ret = 0; + goto out_unlock; + } + /* * Update inode timestamps and remove security privileges before we * take the ilock. @@ -4874,12 +4883,13 @@ int ocfs2_reflink_remap_range(struct file *file_in, round_down(pos_out, PAGE_SIZE), round_up(pos_out + len, PAGE_SIZE) - 1); - ret = ocfs2_reflink_remap_blocks(inode_in, in_bh, pos_in, inode_out, - out_bh, pos_out, len); + remapped = ocfs2_reflink_remap_blocks(inode_in, in_bh, pos_in, + inode_out, out_bh, pos_out, len); up_write(&OCFS2_I(inode_in)->ip_alloc_sem); if (!same_inode) up_write(&OCFS2_I(inode_out)->ip_alloc_sem); - if (ret) { + if (remapped < 0) { + ret = remapped; mlog_errno(ret); goto out_unlock; } @@ -4897,10 +4907,7 @@ int ocfs2_reflink_remap_range(struct file *file_in, goto out_unlock; } - ocfs2_reflink_inodes_unlock(inode_in, in_bh, inode_out, out_bh); - return 0; - out_unlock: ocfs2_reflink_inodes_unlock(inode_in, in_bh, inode_out, out_bh); - return ret; + return remapped > 0 ? remapped : ret; } diff --git a/fs/ocfs2/refcounttree.h b/fs/ocfs2/refcounttree.h index eb65c1d0843c..9e64daba395d 100644 --- a/fs/ocfs2/refcounttree.h +++ b/fs/ocfs2/refcounttree.h @@ -115,11 +115,11 @@ int ocfs2_reflink_ioctl(struct inode *inode, const char __user *oldname, const char __user *newname, bool preserve); -int ocfs2_reflink_remap_range(struct file *file_in, - loff_t pos_in, - struct file *file_out, - loff_t pos_out, - loff_t len, - unsigned int remap_flags); +loff_t ocfs2_reflink_remap_range(struct file *file_in, + loff_t pos_in, + struct file *file_out, + loff_t pos_out, + loff_t len, + unsigned int remap_flags); #endif /* OCFS2_REFCOUNTTREE_H */