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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable 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 EA306C3A5A7 for ; Tue, 3 Sep 2019 11:52:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5CE422CF8 for ; Tue, 3 Sep 2019 11:52:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728860AbfICLwr (ORCPT ); Tue, 3 Sep 2019 07:52:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51670 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727005AbfICLwr (ORCPT ); Tue, 3 Sep 2019 07:52:47 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9F8FEC010923; Tue, 3 Sep 2019 11:52:46 +0000 (UTC) Received: from localhost (dhcp-12-102.nay.redhat.com [10.66.12.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8F3B5D6B7; Tue, 3 Sep 2019 11:52:43 +0000 (UTC) Date: Tue, 3 Sep 2019 19:59:43 +0800 From: Zorro Lang To: "Jianhong.Yin" Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, lsahlber@redhat.com, alexander198961@gmail.com, fengxiaoli0714@gmail.com, dchinner@redhat.com, sandeen@redhat.com Subject: Re: [PATCH] xfsprogs: io/copy_range: cover corner case (fd_in == fd_out) Message-ID: <20190903115943.GU7239@dhcp-12-102.nay.redhat.com> References: <20190903105632.11667-1-yin-jianhong@163.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190903105632.11667-1-yin-jianhong@163.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 03 Sep 2019 11:52:46 +0000 (UTC) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Tue, Sep 03, 2019 at 06:56:32PM +0800, Jianhong.Yin wrote: > Related bug: > copy_file_range return "Invalid argument" when copy in the same file > https://bugzilla.kernel.org/show_bug.cgi?id=202935 > > if argument of option -f is "-", use current file->fd as fd_in > > Usage: > xfs_io -c 'copy_range -f -' some_file > > Signed-off-by: Jianhong Yin > --- Hi, Actually, I'm thinking about if you need same 'fd' or same file path? If you just need same file path, I think # xfs_io -c "copy_range testfile" testfile already can help that. The only one problem stop you doing that is "copy_dst_truncate()". If all above I suppose is right, we can turn to talk about if that copy_dst_truncate() is necessary, or how can we skip it. Thanks, Zorro > io/copy_file_range.c | 27 ++++++++++++++++++--------- > 1 file changed, 18 insertions(+), 9 deletions(-) > > diff --git a/io/copy_file_range.c b/io/copy_file_range.c > index b7b9fd88..2dde8a31 100644 > --- a/io/copy_file_range.c > +++ b/io/copy_file_range.c > @@ -28,6 +28,7 @@ copy_range_help(void) > at position 0\n\ > 'copy_range -f 2' - copies all bytes from open file 2 into the current open file\n\ > at position 0\n\ > + 'copy_range -f -' - copies all bytes from current open file append the current open file\n\ > ")); > } > > @@ -114,11 +115,15 @@ copy_range_f(int argc, char **argv) > } > break; > case 'f': > - src_file_nr = atoi(argv[1]); > - if (src_file_nr < 0 || src_file_nr >= filecount) { > - printf(_("file value %d is out of range (0-%d)\n"), > - src_file_nr, filecount - 1); > - return 0; > + if (strcmp(argv[1], "-")) > + src_file_nr = (file - &filetable[0]) / sizeof(fileio_t); > + else { > + src_file_nr = atoi(argv[1]); > + if (src_file_nr < 0 || src_file_nr >= filecount) { > + printf(_("file value %d is out of range (0-%d)\n"), > + src_file_nr, filecount - 1); > + return 0; > + } > } > /* Expect no src_path arg */ > src_path_arg = 0; > @@ -147,10 +152,14 @@ copy_range_f(int argc, char **argv) > } > len = sz; > > - ret = copy_dst_truncate(); > - if (ret < 0) { > - ret = 1; > - goto out; > + if (fd != file->fd) { > + ret = copy_dst_truncate(); > + if (ret < 0) { > + ret = 1; > + goto out; > + } > + } else { > + dst = sz; > } > } > > -- > 2.17.2 >