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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 D8E79C33CB2 for ; Tue, 28 Jan 2020 23:19:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA99522522 for ; Tue, 28 Jan 2020 23:19:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=osandov-com.20150623.gappssmtp.com header.i=@osandov-com.20150623.gappssmtp.com header.b="Uu/tFiLK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726428AbgA1XTN (ORCPT ); Tue, 28 Jan 2020 18:19:13 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:41009 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726293AbgA1XTN (ORCPT ); Tue, 28 Jan 2020 18:19:13 -0500 Received: by mail-pf1-f196.google.com with SMTP id w62so7443578pfw.8 for ; Tue, 28 Jan 2020 15:19:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gLcRmbaGlZdT/dpZlJUmvZno5pRafmsAvk974Kpo0hg=; b=Uu/tFiLKrEU22a+bF0hgmuvOq+9GWhHCv5ryzlUy7nT/+50ZfTiBYll3DjnDe6Hjhz PXJRMBtu2kF85QlGg3RaoZUj8p+HwPcfeWZgvBAFVA4vn7xP8gPLRXI0DyI0gyWSpvlh OV1te5rVfq6HioNmKqJ8UV0slW89c71OvFm4BlmL3CbxRrTIsGM7f7oVZuvQCnWZrNrq TFxQodMMDMSEJvaon6kziPU3AF+GsT3gPAT4gPCn5GLjnI4LhicIsNGe6uLZzb9KyWhJ igTJaazXFUew+eY2D8sDkWcQ43NonxGEcTqP9en213GTH4AUyg2OON9gG2zaCc1BdOKR Lt0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gLcRmbaGlZdT/dpZlJUmvZno5pRafmsAvk974Kpo0hg=; b=Fptjvt+dTVYayt7cEyZGmj/ipbfgQ1RAgNKTuLE9Gc1xOeCSTn8lk/N9k81NGeIm8H p10uTrCeB00xz6HR2zYK2e8BGFZp6JRZXZji9EJQKMKWs/m9Xfqwq8frwL4SYs9x7LuR mIbQGHyDFyOUwKWZvlJIsaVoX/xf4RscviTyEuD7XOIarYohw7n+jq4BYrxCD1GsjgiA IWuEcprKkhst4/m2e3sKa9tzaMtRnKu+oC1dY8cAUOWkrG/380gLezPLaeT7s6ZDzNYD 7hfoJZM/ybvzN/8WJO2sA+afzeUfg1z31TPCSUctN2aqjo+JA214DvWiq6v9TbE245vB PR5Q== X-Gm-Message-State: APjAAAViPOn0W1eT00l9Hfuk6IHNGfkkHfPue4BDmVJ/+bBf3Xxp+stA +9zMayZ9i82dWKViB8+6ATbNgsc/e/U= X-Google-Smtp-Source: APXvYqyjxSYa9RA7QGQXFGSSazCnhFc+y5dw0aRvRcPjNpp6z895Xr1OzUph51XuP6Argyi+Z5UwmQ== X-Received: by 2002:a65:538b:: with SMTP id x11mr26652080pgq.395.1580253552318; Tue, 28 Jan 2020 15:19:12 -0800 (PST) Received: from vader.thefacebook.com ([2620:10d:c090:200::43a7]) by smtp.gmail.com with ESMTPSA id p24sm156353pgk.19.2020.01.28.15.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 15:19:11 -0800 (PST) From: Omar Sandoval To: linux-fsdevel@vger.kernel.org, Al Viro Cc: kernel-team@fb.com Subject: [RFC PATCH xfsprogs] xfs_io: add support for linkat() AT_LINK_REPLACE Date: Tue, 28 Jan 2020 15:18:58 -0800 Message-Id: X-Mailer: git-send-email 2.25.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Omar Sandoval Signed-off-by: Omar Sandoval --- io/link.c | 24 ++++++++++++++++++++---- man/man8/xfs_io.8 | 9 ++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/io/link.c b/io/link.c index f4f4b139..3fc3e24d 100644 --- a/io/link.c +++ b/io/link.c @@ -12,6 +12,9 @@ #ifndef AT_EMPTY_PATH #define AT_EMPTY_PATH 0x1000 #endif +#ifndef AT_LINK_REPLACE +#define AT_LINK_REPLACE 0x10000 +#endif static cmdinfo_t flink_cmd; @@ -22,6 +25,7 @@ flink_help(void) "\n" "link the open file descriptor to the supplied filename\n" "\n" +" -f -- overwrite the target filename if it exists (AT_LINK_REPLACE)\n" "\n")); } @@ -30,10 +34,22 @@ flink_f( int argc, char **argv) { - if (argc != 2) + int flags = AT_EMPTY_PATH; + int c; + + while ((c = getopt(argc, argv, "f")) != EOF) { + switch (c) { + case 'f': + flags |= AT_LINK_REPLACE; + break; + default: + return command_usage(&flink_cmd); + } + } + if (optind != argc - 1) return command_usage(&flink_cmd); - if (linkat(file->fd, "", AT_FDCWD, argv[1], AT_EMPTY_PATH) < 0) { + if (linkat(file->fd, "", AT_FDCWD, argv[optind], flags) < 0) { perror("flink"); return 0; } @@ -46,9 +62,9 @@ flink_init(void) flink_cmd.name = "flink"; flink_cmd.cfunc = flink_f; flink_cmd.argmin = 1; - flink_cmd.argmax = 1; + flink_cmd.argmax = -1; flink_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK | CMD_FLAG_ONESHOT; - flink_cmd.args = _("filename"); + flink_cmd.args = _("[-f] filename"); flink_cmd.oneline = _("link the open file descriptor to the supplied filename"); flink_cmd.help = flink_help; diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index c69b295d..f79b3a59 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -807,8 +807,15 @@ for the full list) is available via the .B help command. .TP -.BI "flink " path +.BI "flink [ \-f ]" " path" Link the currently open file descriptor into the filesystem namespace. +.RS 1.0i +.PD 0 +.TP 0.4i +.B \-f +overwrite the target path if it exists (AT_LINK_REPLACE). +.PD +.RE .TP .BR stat " [ " \-v "|" \-r " ]" Selected statistics from -- 2.25.0 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 4F6F9C33CB2 for ; Wed, 29 Jan 2020 08:58:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1FD3420716 for ; Wed, 29 Jan 2020 08:58:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=osandov-com.20150623.gappssmtp.com header.i=@osandov-com.20150623.gappssmtp.com header.b="mb8cBEpA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726528AbgA2I6s (ORCPT ); Wed, 29 Jan 2020 03:58:48 -0500 Received: from mail-pj1-f67.google.com ([209.85.216.67]:32823 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726484AbgA2I6r (ORCPT ); Wed, 29 Jan 2020 03:58:47 -0500 Received: by mail-pj1-f67.google.com with SMTP id m7so1393378pjs.0 for ; Wed, 29 Jan 2020 00:58:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osandov-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gLcRmbaGlZdT/dpZlJUmvZno5pRafmsAvk974Kpo0hg=; b=mb8cBEpA3kSfsTu7exv1MCGJUeyN+lfxZAD3Efx9bUHCoXR5j1OU27+equvmQZ9rmt 8N/lTHAPHbVQK/hAFvhEzXu/aJXwAoqlmsNpD9k3k7sb2ERFPLinACzP9tizVbQcAhvO WE/Yl0Va4oA8QYdm9rOz6VHRuai/8H8PVHvwVmmsSIxqy1d43j3j6+0CWH6sZbhB9J5l b8A44RQ5DHymlJTJrQxfFvydpsZbBvrU43SLfmzSG/hoUSiRZqy33mWqZ09DqZxmpcWD 5O6tVbDMRhDI0c+Rm9dloMIVYBBk9qZfX9YehjEQm/z54Sn1WhQIFmn8JhbqQ6RSAAvj FGTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gLcRmbaGlZdT/dpZlJUmvZno5pRafmsAvk974Kpo0hg=; b=bLtu0JJwcPwp1L+0ipcvj4ij3fTk55DmNOiav8kE7lLvxdpIAJxJsXKOpEm+RrXMHX 1BSQR8O4rfNRm9rnOvoRIKbgtMpsSCl/XGjyuwjiE8hQT0XNTV3M+2mbDAiQ+4GQuFYQ 33OS80gUzeq3WmK13LGE0rGywh0mnRHyD+KzImdeIv0cP/ifYIS3K9Z/TzarwFmunUUv Z8p/xO01d6yxA1H+uRIEjz3pTMCGSL2W965Ml2Mfg3DUoJRtGyHP0o2z/I3AeThwYpBq E3YSmF3Wjepr8iLL1oq53k8jJxvZyC/3XkrX8+sfqw9rtuM43szruBKbIMIjV0nhlnOK x3zw== X-Gm-Message-State: APjAAAXXPyPABTPoLWAxE7IMRUqvJj/DcQ6DvAKsqUlf39NCseOP8jX9 N58xONxeVee60nhL7v9TuBj54asHJWw= X-Google-Smtp-Source: APXvYqx4RDyNcm34fCJVlHIU8RNGSRM4h3hd0We3221K6tQ+fvfAEkwzIsyZ0cETIXBDLKQPcLf8ww== X-Received: by 2002:a17:902:a514:: with SMTP id s20mr26765805plq.300.1580288326418; Wed, 29 Jan 2020 00:58:46 -0800 (PST) Received: from vader.hsd1.wa.comcast.net ([2601:602:8b80:8e0:e6a7:a0ff:fe0b:c9a8]) by smtp.gmail.com with ESMTPSA id s131sm1935932pfs.135.2020.01.29.00.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2020 00:58:45 -0800 (PST) From: Omar Sandoval To: linux-fsdevel@vger.kernel.org, Al Viro Cc: kernel-team@fb.com, linux-api@vger.kernel.org, David Howells , Amir Goldstein , Xi Wang Subject: [RFC PATCH xfsprogs] xfs_io: add support for linkat() AT_LINK_REPLACE Date: Wed, 29 Jan 2020 00:58:29 -0800 Message-Id: X-Mailer: git-send-email 2.25.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Message-ID: <20200129085829.YZRtZQGYpufq0VdWlBpse2oJbk0Oid6TaDUZD5ICUVo@z> From: Omar Sandoval Signed-off-by: Omar Sandoval --- io/link.c | 24 ++++++++++++++++++++---- man/man8/xfs_io.8 | 9 ++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/io/link.c b/io/link.c index f4f4b139..3fc3e24d 100644 --- a/io/link.c +++ b/io/link.c @@ -12,6 +12,9 @@ #ifndef AT_EMPTY_PATH #define AT_EMPTY_PATH 0x1000 #endif +#ifndef AT_LINK_REPLACE +#define AT_LINK_REPLACE 0x10000 +#endif static cmdinfo_t flink_cmd; @@ -22,6 +25,7 @@ flink_help(void) "\n" "link the open file descriptor to the supplied filename\n" "\n" +" -f -- overwrite the target filename if it exists (AT_LINK_REPLACE)\n" "\n")); } @@ -30,10 +34,22 @@ flink_f( int argc, char **argv) { - if (argc != 2) + int flags = AT_EMPTY_PATH; + int c; + + while ((c = getopt(argc, argv, "f")) != EOF) { + switch (c) { + case 'f': + flags |= AT_LINK_REPLACE; + break; + default: + return command_usage(&flink_cmd); + } + } + if (optind != argc - 1) return command_usage(&flink_cmd); - if (linkat(file->fd, "", AT_FDCWD, argv[1], AT_EMPTY_PATH) < 0) { + if (linkat(file->fd, "", AT_FDCWD, argv[optind], flags) < 0) { perror("flink"); return 0; } @@ -46,9 +62,9 @@ flink_init(void) flink_cmd.name = "flink"; flink_cmd.cfunc = flink_f; flink_cmd.argmin = 1; - flink_cmd.argmax = 1; + flink_cmd.argmax = -1; flink_cmd.flags = CMD_NOMAP_OK | CMD_FOREIGN_OK | CMD_FLAG_ONESHOT; - flink_cmd.args = _("filename"); + flink_cmd.args = _("[-f] filename"); flink_cmd.oneline = _("link the open file descriptor to the supplied filename"); flink_cmd.help = flink_help; diff --git a/man/man8/xfs_io.8 b/man/man8/xfs_io.8 index c69b295d..f79b3a59 100644 --- a/man/man8/xfs_io.8 +++ b/man/man8/xfs_io.8 @@ -807,8 +807,15 @@ for the full list) is available via the .B help command. .TP -.BI "flink " path +.BI "flink [ \-f ]" " path" Link the currently open file descriptor into the filesystem namespace. +.RS 1.0i +.PD 0 +.TP 0.4i +.B \-f +overwrite the target path if it exists (AT_LINK_REPLACE). +.PD +.RE .TP .BR stat " [ " \-v "|" \-r " ]" Selected statistics from -- 2.25.0