From nobody Thu Mar 5 23:48:22 2026 X-Original-To: dev-commits-src-main@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 4fRmSl0plFz6TsC5 for ; Thu, 05 Mar 2026 23:48:23 +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 4fRmSk5gxPz3M7C for ; Thu, 05 Mar 2026 23:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772754502; 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=+qmdQaXGwwyIFuwQlmVEsm4P48ShPvCfHp7lnaSP4Ls=; b=ij7R5adUrOn6+9JHSEMNZ7/B7nt58M1sbwBvnktNe4pmDPRgbll8n/EyXW+nFqX+aGaD6P 0ChxkjeCXwBs312jO4moYRxvW+MaYGHS1LVcnbigzd5lRZM5SJEL3KL9JkD4bSYJQNMDcY mCfqLJCprQWFMYL9Z7hcZ0roOQRJIK6lFFMe7n3PY7Wd5WjClhXxOxU94s8T1ej9PmEGhJ EIswJ7M4e9tndyk2zTZ7AR+K5anRu/4uYJYRGI0zYfQqcMBfOMRGFA434QwE4LZwheCFkr gBldRxVj1CLQkaYPrrFLlx8MzWc4wnpt9yG9qMjfDb9kGq6S1WffWc8vQkRWQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772754502; a=rsa-sha256; cv=none; b=NMotz+wDeL79+FtLob7miEDlLSDSGHD8aI64R4x+dw/uu5jFJ63VPQ/09zx1VZZJeKRZbJ Vq3RBeJWtx9PICzqPEaFgIpgTEr/aFLP/FMvMx45G9wwMeT3RaVBYkagP5oVznFWa6GCWc IjvOw2h6yJr8/I+9zGAWUQxEe1/QfeNdQAD899iDQDFoMyA7DJSC9OkZOmBMZLMZFg+mwW whkr3xFpqm79bw7/4biS9810NCvf0nb4IbDI1p2qnMrf2ElmwGX+CavNQq20k727nD8UCq HxP6WotTeQlVsZZNm7YDuBM1BYrzyK+IEEDt9c5iUf4MBCiIXrNnO9OTZr5Kug== 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=1772754502; 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=+qmdQaXGwwyIFuwQlmVEsm4P48ShPvCfHp7lnaSP4Ls=; b=otAsCOcJdtiEnhBDcQihGg3IGC7/tYnlvRwSi6k5O/EqW6SGXeevNSYzJM7l8qeHOpMGWc MGK1x4+G5q03Qt7ZM49v4DJcZtTF0WXUNYJ2pO+y5tsTbLOZ5SWOhbXEaScIXUcKH3LjZZ h0YkMQXSh9rXyApNpc3ZmC8+ntO37dG4ClySJD2jQohcImeL+LKGmurd3R1la0sG83Gadi Y7f327uB5LwZS99PuZLmRz4hB1nFVGd2k99ECGpWGgm6ulrl1qays/EHT4JcLTiO3Fd1cs G8okxFU6Ro8/J1b5EmTQ+8icd2ZMF0vPW3YflSk/JDhq9eHzTrX+6mtLijBGSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRmSk5CFdzycl for ; Thu, 05 Mar 2026 23:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e6fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 23:48:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8feb8d221cfb - main - linuxolator: translate LINUX_RENAME_NOREPLACE into our AT_RENAME_NOREPLACE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8feb8d221cfb842ee11d744d22571baec6c18cd8 Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 23:48:22 +0000 Message-Id: <69aa1646.3e6fc.654bf75@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8feb8d221cfb842ee11d744d22571baec6c18cd8 commit 8feb8d221cfb842ee11d744d22571baec6c18cd8 Author: Konstantin Belousov AuthorDate: 2026-02-26 19:21:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-05 23:46:53 +0000 linuxolator: translate LINUX_RENAME_NOREPLACE into our AT_RENAME_NOREPLACE Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55539 --- 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