From patchwork Sun Oct 21 16:18:04 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: 10651243 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 D892C13A9 for ; Sun, 21 Oct 2018 16:18:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C58B7287B7 for ; Sun, 21 Oct 2018 16:18:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B962E287C7; Sun, 21 Oct 2018 16:18: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=-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 5AED1287C0 for ; Sun, 21 Oct 2018 16:18:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48A116B028B; Sun, 21 Oct 2018 12:18:09 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3EAF16B028D; Sun, 21 Oct 2018 12:18:09 -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 23DB76B028E; Sun, 21 Oct 2018 12:18:09 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by kanga.kvack.org (Postfix) with ESMTP id E00486B028B for ; Sun, 21 Oct 2018 12:18:08 -0400 (EDT) Received: by mail-yb1-f199.google.com with SMTP id f8-v6so22947441ybn.22 for ; Sun, 21 Oct 2018 09:18:08 -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=jZPaIA2I61+2o/Blz6OYutRXgyd1ozFk3SQt5++KfCo=; b=jD1huVOebjZXcE42MwTFPVQuy0b5euVU8DuGtSKy6wJv20G9B2Ox94O5vTJjtZxRQX 0tEE30yP93SQQrXhAx0A+Qv/NxwhDwve+vWNpzwXh6TbH6KKZ3j1FchFq/I2x6KQ0TwN mzcAsy9xdS4rlak7JlZIomHaipZf3OmtppqVyE6RXPCyxqowFB5LySK+O3Ay8sRlLzH2 i4O2ADbCjT4u5JXMfWE7ewQrQj7wL9CddwTV7d83U2M8LBJepaKcHBGpitltrzX6W3Ds gXl7R27YcT81I6hn8BGf5tu2aHJZ84HC3Hsd8mBi66iSsEShrraveUbCRf5t4Qmqtfnp XP3Q== X-Gm-Message-State: ABuFfohRjuLwtD+1FJ3UubZ1xLPW0lS9IByxpz7G0RJ/mM/mccPVqRLH T5EDXXOPUKT1ac8aKaSWTT2bj4V++nWllUX04FuQfpwIKMcHmVscRuq5HkLl8r76WbiWih5Muxh IZpp2o/6PTIaHylFcIlaRr44yP7MHQIWEEQ4hOPh1qXjhI91LAFVZ7e8TsMhsdJ09aw== X-Received: by 2002:a25:2488:: with SMTP id k130-v6mr18805060ybk.311.1540138688679; Sun, 21 Oct 2018 09:18:08 -0700 (PDT) X-Google-Smtp-Source: ACcGV61+k/wswrkq3zjN4u0IFporIYMoAFld2J6c173sxQIeMoiDLCVc91OD0t+tpJWu5KucogkA X-Received: by 2002:a25:2488:: with SMTP id k130-v6mr18805026ybk.311.1540138688031; Sun, 21 Oct 2018 09:18:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540138688; cv=none; d=google.com; s=arc-20160816; b=lOlJIB2WolE/M0kTNr0RFLYuiJbF5Mdyn7HU2orxALo3MllCz9o/yzE4DeLEPc+a9Y f3+Yb/qI4mYzelBNTdTl1dVJUyjziSQE44weXkFP2szeV5+piFxFkWhBcpFpj++AwsSn m9ZPOS4o0H5bzUBcRTKuJ7gRDY4IA5pIrpT9gkxsdj+5Yr6WcYjHfaTg2v/f3PtSWdvD IIgaz54MKSyj76wvaoBUyT8yP2KmxgasL43J+VE2LDvboBzDo+cd1tQpGzcNhDC4aXC2 xym8TnOSgpIelt8WlAP2Tt2Wyy5TXsQYYq4bmeXFtGqvXSpH/Q+bKPZQA29hAosbFsrm vL6g== 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=jZPaIA2I61+2o/Blz6OYutRXgyd1ozFk3SQt5++KfCo=; b=sx1OOaYtUCpNWbW1YxMagEtcm5rr8WyGrC0OmQmIMvtdZqoUkdRxrGFeIzZteyEwWb SWfd8SLxaiLckPSdP8WdqGG4TnZuxz73Iq5CE6+737MZk/ivTVxTGJNSpS7nip+yJnSH QCYJoennAUd94E3rY05piJFZo2X3TJb9acXE1R37YmnfZ07p4l7xddp9cfYvl8U/6mK8 +/e7VBhvWzzd9+/zo6dwcOvcyLLqJ6lbgcqIM8QanLC9ChCCpdRejT4fq78MNaSjneht BMiIutHeCw42WEFzy0HLKeLsYimmYMoU28B2Ukf1ZUHeHvncoCs+OKW9DSnuDDOHdzLA BxBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b="NSGYgg/o"; 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 p25-v6si13350638ybj.295.2018.10.21.09.18.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Oct 2018 09:18:07 -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="NSGYgg/o"; 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 w9LGF3DN155374; Sun, 21 Oct 2018 16:18:07 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=jZPaIA2I61+2o/Blz6OYutRXgyd1ozFk3SQt5++KfCo=; b=NSGYgg/otcR4G6dS5NR+JWv/XOrstKKjYhWITEdiqmfQzax1xvLustf1TH6iz/Pg6RLB TCBPP/Yv4EmG+cRL1y/SuklDDau/Z/+0LfaftJVGDTqMjfKFC8b82VG9CahErOvU1oPX wwvksMdkyEd4B9UnuQ/ZrQtBGWpii1HD+kzVTFvS7v/3fJWMLX/BjV5Dh8IR6S+kjnVb 4syLhtd1QU54kU//12AAqdQHndbGq9rpcOkfFwvasXm29dxRkFCgzkZQ1+nrEc4d83O9 8/i2U3Vv8EAYfdEdSuKw7/1swAnXj8yopimp6HvFVZEWHg7pn35Xx/hNiJf5fzdqfK6o sg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp2120.oracle.com with ESMTP id 2n7vapjysn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 21 Oct 2018 16:18:07 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9LGI6ma011272 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 21 Oct 2018 16:18:06 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w9LGI6wA025010; Sun, 21 Oct 2018 16:18:06 GMT Received: from localhost (/10.159.225.70) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 21 Oct 2018 09:18:05 -0700 Subject: [PATCH 26/28] xfs: remove redundant remap partial EOF block checks 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, Dave Chinner , linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com Date: Sun, 21 Oct 2018 09:18:04 -0700 Message-ID: <154013868417.29026.5852711121957107278.stgit@magnolia> In-Reply-To: <154013850285.29026.16168387526580596209.stgit@magnolia> References: <154013850285.29026.16168387526580596209.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9053 signatures=668683 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-1810210151 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 Now that we've moved the partial EOF block checks to the VFS helpers, we can remove the redundant functionality from XFS. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fs/xfs/xfs_reflink.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 4abb2aea8f31..bccc66316cc4 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -1314,7 +1314,6 @@ xfs_reflink_remap_prep( struct inode *inode_out = file_inode(file_out); struct xfs_inode *dest = XFS_I(inode_out); bool same_inode = (inode_in == inode_out); - u64 blkmask = i_blocksize(inode_in) - 1; ssize_t ret; /* Lock both files against IO */ @@ -1342,24 +1341,6 @@ xfs_reflink_remap_prep( if (ret < 0 || *len == 0) goto out_unlock; - /* - * If the dedupe data matches, chop off the partial EOF block - * from the source file so we don't try to dedupe the partial - * EOF block. - */ - if (remap_flags & REMAP_FILE_DEDUP) { - *len &= ~blkmask; - } else if (*len & blkmask) { - /* - * The user is attempting to share a partial EOF block, - * if it's inside the destination EOF then reject it. - */ - if (pos_out + *len < i_size_read(inode_out)) { - ret = -EINVAL; - goto out_unlock; - } - } - /* Attach dquots to dest inode before changing block map */ ret = xfs_qm_dqattach(dest); if (ret)