From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 6825270EBB for ; Wed, 9 Jun 2021 15:18:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5C49A2505A for ; Wed, 9 Jun 2021 15:18:58 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6D9B925047 for ; Wed, 9 Jun 2021 15:18:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4378D42303 for ; Wed, 9 Jun 2021 15:18:57 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Wed, 9 Jun 2021 15:18:45 +0200 Message-Id: <20210609131852.167416-2-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210609131852.167416-1-w.bumiller@proxmox.com> References: <20210609131852.167416-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.702 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [syscall.ph, tools.pm, syscall.pm] Subject: [pve-devel] [PATCH common] Syscalls/Tools: add renameat2 X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2021 13:18:58 -0000 Mostly for the ability to atomically swap files. Signed-off-by: Wolfgang Bumiller --- src/PVE/Syscall.pm | 1 + src/PVE/Tools.pm | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/src/PVE/Syscall.pm b/src/PVE/Syscall.pm index 2d5019f..10e185d 100644 --- a/src/PVE/Syscall.pm +++ b/src/PVE/Syscall.pm @@ -17,6 +17,7 @@ BEGIN { setresuid => &SYS_setresuid, fchownat => &SYS_fchownat, mount => &SYS_mount, + renameat2 => &SYS_renameat2, # These use asm-generic, so they're the same across (sane) architectures. We use numbers # since they're not in perl's syscall.ph yet... diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm index 16ae3d2..63bf075 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tools.pm @@ -104,6 +104,11 @@ use constant {O_PATH => 0x00200000, use constant {AT_EMPTY_PATH => 0x1000, AT_FDCWD => -100}; +# from +use constant {RENAME_NOREPLACE => (1 << 0), + RENAME_EXCHANGE => (1 << 1), + RENAME_WHITEOUT => (1 << 2)}; + sub run_with_timeout { my ($timeout, $code, @param) = @_; @@ -1461,6 +1466,11 @@ sub fsync($) { return 0 == syscall(PVE::Syscall::fsync, $fileno); } +sub renameat2($$$$$) { + my ($olddirfd, $oldpath, $newdirfd, $newpath, $flags) = @_; + return 0 == syscall(PVE::Syscall::renameat2, $olddirfd, $oldpath, $newdirfd, $newpath, $flags); +} + sub sync_mountpoint { my ($path) = @_; sysopen my $fd, $path, O_RDONLY|O_CLOEXEC or die "failed to open $path: $!\n"; -- 2.30.2