From patchwork Wed Sep 30 17:26:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 7300861 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 465E4BEEA4 for ; Wed, 30 Sep 2015 17:27:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 818C420676 for ; Wed, 30 Sep 2015 17:27:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88C9D20658 for ; Wed, 30 Sep 2015 17:27:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933021AbbI3R1u (ORCPT ); Wed, 30 Sep 2015 13:27:50 -0400 Received: from mx144.netapp.com ([216.240.21.25]:61534 "EHLO mx144.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932747AbbI3R1Q (ORCPT ); Wed, 30 Sep 2015 13:27:16 -0400 X-IronPort-AV: E=Sophos;i="5.17,613,1437462000"; d="scan'208";a="71081569" Received: from vmwexchts02-prd.hq.netapp.com ([10.122.105.23]) by mx144-out.netapp.com with ESMTP; 30 Sep 2015 10:27:14 -0700 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCHTS02-PRD.hq.netapp.com (10.122.105.23) with Microsoft SMTP Server id 15.0.1104.5; Wed, 30 Sep 2015 10:27:14 -0700 Received: from davros.com ([10.63.231.153]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id t8UHQunu026290; Wed, 30 Sep 2015 10:27:12 -0700 (PDT) From: Anna Schumaker To: , , , , , , , , , , Subject: [PATCH v5 7/9] vfs: Remove copy_file_range mountpoint checks Date: Wed, 30 Sep 2015 13:26:51 -0400 Message-ID: <1443634014-3026-8-git-send-email-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.6.0 In-Reply-To: <1443634014-3026-1-git-send-email-Anna.Schumaker@Netapp.com> References: <1443634014-3026-1-git-send-email-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I still want to do an in-kernel copy even if the files are on different mountpoints, and NFS has a "server to server" copy that expects two files on different mountpoints. Let's have individual filesystems implement this check instead. Signed-off-by: Anna Schumaker Reviewed-by: David Sterba --- fs/read_write.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 6f74f1f..ee9fa37 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1366,11 +1366,6 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, pos_in + len > i_size_read(inode_in)) return -EINVAL; - /* this could be relaxed once a method supports cross-fs copies */ - if (inode_in->i_sb != inode_out->i_sb || - file_in->f_path.mnt != file_out->f_path.mnt) - return -EXDEV; - if (len == 0) return 0;