From patchwork Tue Sep 29 18:05:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 7289041 Return-Path: X-Original-To: patchwork-linux-btrfs@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 C16DEBEEA4 for ; Tue, 29 Sep 2015 18:06:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1F4120645 for ; Tue, 29 Sep 2015 18:06:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D16020650 for ; Tue, 29 Sep 2015 18:06:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935378AbbI2SFn (ORCPT ); Tue, 29 Sep 2015 14:05:43 -0400 Received: from mx141.netapp.com ([216.240.21.12]:56103 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935368AbbI2SFd (ORCPT ); Tue, 29 Sep 2015 14:05:33 -0400 X-IronPort-AV: E=Sophos;i="5.17,609,1437462000"; d="scan'208";a="71923820" Received: from vmwexchts02-prd.hq.netapp.com ([10.122.105.23]) by mx141-out.netapp.com with ESMTP; 29 Sep 2015 11:05:32 -0700 Received: from smtp1.corp.netapp.com (10.57.156.124) by VMWEXCHTS02-PRD.hq.netapp.com (10.122.105.23) with Microsoft SMTP Server id 15.0.1104.5; Tue, 29 Sep 2015 11:05:32 -0700 Received: from davros.com ([10.63.231.171]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id t8TI5EeO008611; Tue, 29 Sep 2015 11:05:30 -0700 (PDT) From: Anna Schumaker To: , , , , , , , , , , Subject: [PATCH v4 7/9] vfs: Remove copy_file_range mountpoint checks Date: Tue, 29 Sep 2015 14:05:10 -0400 Message-ID: <1443549913-8091-8-git-send-email-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1443549913-8091-1-git-send-email-Anna.Schumaker@Netapp.com> References: <1443549913-8091-1-git-send-email-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@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;