From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CA18C4740C for ; Mon, 9 Sep 2019 15:57:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50E4A2086D for ; Mon, 9 Sep 2019 15:57:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568044647; bh=mS6h0wRCgOEJl2DMZO33aZMuY2S0aIItp+c/qkMzDe8=; h=Subject:From:To:Cc:Date:In-Reply-To:References:List-ID:From; b=BHW8y6RI9eUrQW8bH3XB2S8nyutqX38byqoa03VpDCN1FHNW9d3k9e/a9dGLIPLdu K0ysciR3cKqwqPAqdh/8b6KCwlzQn9EJaCHJJzxqjGY3lEBk3n3XhOhrfLnk3hrJ7H bVuzXi/qk2vgGArgxwK6uOx2d++klXWBjisADcPo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388903AbfIIP50 (ORCPT ); Mon, 9 Sep 2019 11:57:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:41040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728681AbfIIP50 (ORCPT ); Mon, 9 Sep 2019 11:57:26 -0400 Received: from tleilax.poochiereds.net (68-20-15-154.lightspeed.rlghnc.sbcglobal.net [68.20.15.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DB28020863; Mon, 9 Sep 2019 15:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568044645; bh=mS6h0wRCgOEJl2DMZO33aZMuY2S0aIItp+c/qkMzDe8=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=MIu70yxTzl06yoa4MbvPtGvoRjo6BWDAYky6HRAqBtfA0ZYaqSCjG/Sb1+73pbPGd LS+1wBBER196JoYq4l0vYHB9ep1Rvsg23Qj1vl6Jn9qkTIvXRQ5iBDXSwDqcc70vAC qQ7Zl10aRXaFc+WesafEyJjeW/8xCC3NyS45h7i0= Message-ID: <58db3e32a1406b5758b1fa43e5e845cd050cf499.camel@kernel.org> Subject: Re: [PATCH v3] ceph: allow object copies across different filesystems in the same cluster From: Jeff Layton To: Luis Henriques , Sage Weil , Ilya Dryomov Cc: ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 09 Sep 2019 11:57:23 -0400 In-Reply-To: <20190909154854.23839-1-lhenriques@suse.com> References: <20190909154854.23839-1-lhenriques@suse.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.32.4 (3.32.4-1.fc30) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2019-09-09 at 16:48 +0100, Luis Henriques wrote: > OSDs are able to perform object copies across different pools. Thus, > there's no need to prevent copy_file_range from doing remote copies if the > source and destination superblocks are different. Only return -EXDEV if > they have different fsid (the cluster ID). > > Signed-off-by: Luis Henriques > --- > fs/ceph/file.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > Hi, > > Here's the changelog: > > * since v2 > > - single dout() in error path > > * since v1: > > - Dropped have_fsid checks on client structs > - Use %pU to print the fsid instead of raw hex strings (%*ph) > - Fixed 'To:' field in email so that this time the patch hits vger > > Cheers, > -- > Luis > > diff --git a/fs/ceph/file.c b/fs/ceph/file.c > index 685a03cc4b77..846cf5aea85e 100644 > --- a/fs/ceph/file.c > +++ b/fs/ceph/file.c > @@ -1904,6 +1904,7 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off, > struct ceph_inode_info *src_ci = ceph_inode(src_inode); > struct ceph_inode_info *dst_ci = ceph_inode(dst_inode); > struct ceph_cap_flush *prealloc_cf; > + struct ceph_fs_client *src_fsc = ceph_inode_to_client(src_inode); > struct ceph_object_locator src_oloc, dst_oloc; > struct ceph_object_id src_oid, dst_oid; > loff_t endoff = 0, size; > @@ -1915,8 +1916,16 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off, > > if (src_inode == dst_inode) > return -EINVAL; > - if (src_inode->i_sb != dst_inode->i_sb) > - return -EXDEV; > + if (src_inode->i_sb != dst_inode->i_sb) { > + struct ceph_fs_client *dst_fsc = ceph_inode_to_client(dst_inode); > + > + if (ceph_fsid_compare(&src_fsc->client->fsid, > + &dst_fsc->client->fsid)) { > + dout("Copying files across clusters: src: %pU dst: %pU\n", > + &src_fsc->client->fsid, &dst_fsc->client->fsid); > + return -EXDEV; > + } > + } > if (ceph_snap(dst_inode) != CEPH_NOSNAP) > return -EROFS; > > @@ -1928,7 +1937,7 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off, > * efficient). > */ > > - if (ceph_test_mount_opt(ceph_inode_to_client(src_inode), NOCOPYFROM)) > + if (ceph_test_mount_opt(src_fsc, NOCOPYFROM)) > return -EOPNOTSUPP; > > if ((src_ci->i_layout.stripe_unit != dst_ci->i_layout.stripe_unit) || > @@ -2044,7 +2053,7 @@ static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off, > dst_ci->i_vino.ino, dst_objnum); > /* Do an object remote copy */ > err = ceph_osdc_copy_from( > - &ceph_inode_to_client(src_inode)->client->osdc, > + &src_fsc->client->osdc, > src_ci->i_vino.snap, 0, > &src_oid, &src_oloc, > CEPH_OSD_OP_FLAG_FADVISE_SEQUENTIAL | Thanks Luis. Merged into testing branch. -- Jeff Layton