From nobody Tue Mar 10 11:43:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8G5bFGz6VWN4 for ; Tue, 10 Mar 2026 11:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fVX8G3wdCz49kp for ; Tue, 10 Mar 2026 11:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfsH7hkJeO+kc9gSdNAhdXXe6DLwBjW/xlOR9ev9WjU=; b=IssJWhoKaBZNccAe92T8t1/nKi1LvjqElak//UkbVxShY1fKQwnwMKsbawFVmCvUdSdlNr qefa08Qi1PNpoNj/eo661KmLvlwhnNR5bkwlc/86VZLPV8OV1x9Y8W3yzBFReAVcYkQ11R +IRe4/Dn8tM4ouDLOsCX/cXdqxxEJ6q3o1c5F7zYjx48VngGGg6aTbhk95g+jyV5bzzIhX xmSAKN+08IJynAeiKU0sIWZCQmvzsR+lzU3f1+6wWoFBSfha52Pt0gwMyXTtxhsik/cbJN SrTPBR0WGHZOWHENdJTm7m3bUxJ5IK80ws+VaI6/8B4K4NOxp9cx95N491Nn+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143022; a=rsa-sha256; cv=none; b=pB2cZsPPCkky9N9BedHAryo/8wuC0X5+MZ+VNiC7kTHBaLky2Yi+p/W/uOTARrHjvwErYo ShIGUeDPP84jFYhUjT2PoR0w7VETbS6SFMezXKwnRzwVSQQUXeAEDq1uK/YBbp7ZjFQ+Rp tO+bt27u78uPBonilrj9TGGrYFOaQuXmKk6B+1uXjK1LGTZDqJQaBDNJUDvLYk56XFsNMg DJIuzmnRBJZHRzRp3b111qtCx9dkO6ioAdCA38JnJCZbWRHGjn5Jd5GXq5DqSJADwZ3hDr bPImUiWcY8aXSIsPyzO2d7r+/RZSNA0Oww2FP9tg0noNSptlRQ0hKD3aWhcflg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZfsH7hkJeO+kc9gSdNAhdXXe6DLwBjW/xlOR9ev9WjU=; b=wXCW3ICiOD+PW+hV1k3gxJKRjuNX8UrHsyNQyIqIz2Pma5/go3Qg5YxzWfR6aei/bYUKhQ Sh9zS0x7QktbgtQgiZ/NompbKVvizqVyvNPr5ftOjuIAZgo5D6uO/1kB1kE0UEfAEoKNo1 50tNBDxApzzmT65yIXUDRl5GB1C/TJXw13AObC+lEo4eiD6qSoQgHMrLm5+nshYa9YW/jk LMDsM7Qgg6NCFypcifpveFsyMCev5rVgTUGvOCUDTk1GWjTARvBinL5JtnjmSEILWvhfxU quPeC6SVl/hug3m/6Mj5ShFNZrZLUlplkTymlYZlR9qCKN9V27wEful25Bsjfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8G3Vlgz19c7 for ; Tue, 10 Mar 2026 11:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d523 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b2ae957e9c8f - stable/15 - linuxolator: translate LINUX_RENAME_NOREPLACE into our AT_RENAME_NOREPLACE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b2ae957e9c8fd6a67a37fe38efed2c034dbe81b0 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:42 +0000 Message-Id: <69b003ee.1d523.11768c3b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b2ae957e9c8fd6a67a37fe38efed2c034dbe81b0 commit b2ae957e9c8fd6a67a37fe38efed2c034dbe81b0 Author: Konstantin Belousov AuthorDate: 2026-02-26 19:21:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:32 +0000 linuxolator: translate LINUX_RENAME_NOREPLACE into our AT_RENAME_NOREPLACE (cherry picked from commit 8feb8d221cfb842ee11d744d22571baec6c18cd8) --- sys/compat/linux/linux_file.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 43ccac0308d3..30e79a53ad2a 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -833,23 +833,34 @@ int linux_renameat2(struct thread *td, struct linux_renameat2_args *args) { int olddfd, newdfd; + u_int atflags; - if (args->flags != 0) { - if (args->flags & ~(LINUX_RENAME_EXCHANGE | - LINUX_RENAME_NOREPLACE | LINUX_RENAME_WHITEOUT)) - return (EINVAL); - if (args->flags & LINUX_RENAME_EXCHANGE && - args->flags & (LINUX_RENAME_NOREPLACE | - LINUX_RENAME_WHITEOUT)) + atflags = 0; + if ((args->flags & ~(LINUX_RENAME_EXCHANGE | + LINUX_RENAME_NOREPLACE | LINUX_RENAME_WHITEOUT)) != 0) + return (EINVAL); + if ((args->flags & LINUX_RENAME_EXCHANGE) != 0 && + (args->flags & (LINUX_RENAME_NOREPLACE | + LINUX_RENAME_WHITEOUT)) != 0) + return (EINVAL); + if ((args->flags & LINUX_RENAME_NOREPLACE) != 0) { + if ((args->flags & (LINUX_RENAME_EXCHANGE | + LINUX_RENAME_WHITEOUT)) != 0) return (EINVAL); -#if 0 + args->flags &= ~LINUX_RENAME_NOREPLACE; + atflags |= AT_RENAME_NOREPLACE; + } + + if (args->flags != 0) { /* * This spams the console on Ubuntu Focal. * - * What's needed here is a general mechanism to let users know - * about missing features without hogging the system. + * What's needed here is a general mechanism to let + * users know about missing features without hogging + * the system. */ - linux_msg(td, "renameat2 unsupported flags 0x%x", +#if 0 + linux_msg(td, "renameat2 unsupported flags %#x", args->flags); #endif return (EINVAL); @@ -858,7 +869,7 @@ linux_renameat2(struct thread *td, struct linux_renameat2_args *args) olddfd = (args->olddfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->olddfd; newdfd = (args->newdfd == LINUX_AT_FDCWD) ? AT_FDCWD : args->newdfd; return (kern_renameat(td, olddfd, args->oldname, newdfd, - args->newname, UIO_USERSPACE, 0)); + args->newname, UIO_USERSPACE, atflags)); } #ifdef LINUX_LEGACY_SYSCALLS