From nobody Thu Mar 5 23:48:21 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 4fRmSk1SGcz6TsLZ for ; Thu, 05 Mar 2026 23:48:22 +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 4fRmSj4pLqz3M98 for ; Thu, 05 Mar 2026 23:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772754501; 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=lVq3XtUrtgJ2D/AXIUrm0M8Mg7OkYPABEaR/tsliZ9c=; b=rvV09y4LOmpbaMIc7mmvl//TLxhsyblHhi5hjNiGBIVGWJKPA7LnHJJglzA8UNp1GjGqAm p2XWghPyXURxDSfA6QaJFyIurwclvKtisTjLT6KW6nfTUWbpYklc5kNdNHoi+q9HyT/day j6WG6rvjhFMVs/aR49TXhZdoIUuXTe1hgS4CAPkzvvkZEPdlTKL7LslYNXHABbHZy6DE2s r1CsHdY+iIxXSSOBfuEU+DJ4N2FYbVIX45/d5oDJ4E4OyocIIFlOwXHdmh9kE7UxlK+Uw3 5U8T1Z2oWfOxOzs2nE2ro7R4VajZKi07vHTyZC9Wk+MHUvogAlZZu0KyYeQt/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772754501; a=rsa-sha256; cv=none; b=Q1S9eog7JtBEzGk16oPqwgLoNBLwCbNd2F0Z37NqySNd8bN70E/TwWAM8wzswbdrzfPMOm Dvokz0vBACgjgTk4sSs2IMF7x7Zm9cSsxrqN+UKwJdgCZybs2yZz5q0SIHPlheY41BNkFV 7EWGLPspQwQxAxN3rt9JEXc2z27wb7oJAeXwgqK/9q3frf+L5LnlWJE2AlwwZJf3jleRb3 Gg74r/bOvu1SakJzHnhkCdTDQ9ABViRb91k6uoSAXLJq/CKvQYEUvl9qw5d5d5qQwh39Wp 9Ywr8jpUBLrcLW3Kfc/sHnFYz5zXKNHHQnrNYim8sKQf9BQ9tMYtS0n/b1mdrg== 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=1772754501; 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=lVq3XtUrtgJ2D/AXIUrm0M8Mg7OkYPABEaR/tsliZ9c=; b=cn/uMJhs/Bd1lMNrvwFRnwwIglaL66Jwl+fgg6vFrCNNG/Wk/wt4YNVC2hh4ZE83ovb1QJ 8fw/MwaDJOJfFiy51TUB6MhwPogF+jpi5LTfSS9lBJLkES2lQ8kB/CZbihBMu0g8isUrxe 2qM2ImZOi8YscVRV51bVe34Am0uwwQ0L04FZYfPfZatGX5F0Cs8cBJ/M5yopQKCDQb3S59 n4ek2viLDSH78oQ9dFnlsu/YhVTgyAbIW1dta9feL4tsTBTCyCnl0aa73nbOcyEhWgvy+r oRHdCs/BOC3fM6nSdx5GO/g7FHYXdVp/uTeTWZA9J+c/NjA32ACGF+UxcEYBKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRmSj4LNLzyJB for ; Thu, 05 Mar 2026 23:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f28a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 23:48:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7a1217ff3bbd - main - zfs: implement 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: 7a1217ff3bbdd1ef40d1b94170c53611fadeb026 Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 23:48:21 +0000 Message-Id: <69aa1645.3f28a.6da320f9@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7a1217ff3bbdd1ef40d1b94170c53611fadeb026 commit 7a1217ff3bbdd1ef40d1b94170c53611fadeb026 Author: Konstantin Belousov AuthorDate: 2026-03-01 13:16:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-05 23:46:53 +0000 zfs: implement AT_RENAME_NOREPLACE Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55539 --- .../include/os/freebsd/zfs/sys/zfs_vnops_os.h | 4 ++-- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 25 +++++++++++++++------- sys/contrib/openzfs/module/zfs/zfs_replay.c | 2 +- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h index e27c6527e2b6..17ba5255b7b2 100644 --- a/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h +++ b/sys/contrib/openzfs/include/os/freebsd/zfs/sys/zfs_vnops_os.h @@ -42,8 +42,8 @@ extern int zfs_rmdir(znode_t *dzp, const char *name, znode_t *cwd, extern int zfs_setattr(znode_t *zp, vattr_t *vap, int flag, cred_t *cr, zidmap_t *mnt_ns); extern int zfs_rename(znode_t *sdzp, const char *snm, znode_t *tdzp, - const char *tnm, cred_t *cr, int flags, uint64_t rflags, vattr_t *wo_vap, - zidmap_t *mnt_ns); + const char *tnm, cred_t *cr, int flags, uint64_t rflags, u_int at_flags, + vattr_t *wo_vap, zidmap_t *mnt_ns); extern int zfs_symlink(znode_t *dzp, const char *name, vattr_t *vap, const char *link, znode_t **zpp, cred_t *cr, int flags, zidmap_t *mnt_ns); extern int zfs_link(znode_t *tdzp, znode_t *sp, diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 04fd772603b9..d0c1a4755b22 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -3256,7 +3256,7 @@ zfs_rename_check(znode_t *szp, znode_t *sdzp, znode_t *tdzp) static int zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, vnode_t *tdvp, vnode_t **tvpp, struct componentname *tcnp, - cred_t *cr); + cred_t *cr, u_int at_flags); /* * Move an entry from the provided source directory to the target @@ -3267,6 +3267,7 @@ zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, * tdvp - Target directory to contain the "new entry". * tcnp - New entry name. * cr - credentials of caller. + * at_flags - AT_RENAME_* * INOUT: svpp - Source file * tvpp - Target file, may point to NULL initially * @@ -3278,7 +3279,7 @@ zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, static int zfs_do_rename(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, vnode_t *tdvp, vnode_t **tvpp, struct componentname *tcnp, - cred_t *cr) + cred_t *cr, u_int at_flags) { int error; @@ -3307,7 +3308,8 @@ zfs_do_rename(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, return (error); } - error = zfs_do_rename_impl(sdvp, svpp, scnp, tdvp, tvpp, tcnp, cr); + error = zfs_do_rename_impl(sdvp, svpp, scnp, tdvp, tvpp, tcnp, cr, + at_flags); VOP_UNLOCK(sdvp); VOP_UNLOCK(*svpp); out: @@ -3322,7 +3324,7 @@ out: static int zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, vnode_t *tdvp, vnode_t **tvpp, struct componentname *tcnp, - cred_t *cr) + cred_t *cr, u_int at_flags) { dmu_tx_t *tx; zfsvfs_t *zfsvfs; @@ -3431,6 +3433,11 @@ zfs_do_rename_impl(vnode_t *sdvp, vnode_t **svpp, struct componentname *scnp, * Does target exist? */ if (tzp) { + if ((at_flags & AT_RENAME_NOREPLACE) != 0) { + error = SET_ERROR(EEXIST); + goto out; + } + /* * Source and target must be the same type. */ @@ -3551,7 +3558,8 @@ out: int zfs_rename(znode_t *sdzp, const char *sname, znode_t *tdzp, const char *tname, - cred_t *cr, int flags, uint64_t rflags, vattr_t *wo_vap, zidmap_t *mnt_ns) + cred_t *cr, int flags, uint64_t rflags, u_int at_flags, vattr_t *wo_vap, + zidmap_t *mnt_ns) { struct componentname scn, tcn; vnode_t *sdvp, *tdvp; @@ -3583,7 +3591,8 @@ zfs_rename(znode_t *sdzp, const char *sname, znode_t *tdzp, const char *tname, goto fail; } - error = zfs_do_rename(sdvp, &svp, &scn, tdvp, &tvp, &tcn, cr); + error = zfs_do_rename(sdvp, &svp, &scn, tdvp, &tvp, &tcn, cr, + at_flags); fail: if (svp != NULL) vrele(svp); @@ -5527,12 +5536,12 @@ zfs_freebsd_rename(struct vop_rename_args *ap) } #endif - if (error == 0 && ap->a_flags != 0) + if (error == 0 && (ap->a_flags & ~(AT_RENAME_NOREPLACE)) != 0) error = EOPNOTSUPP; if (error == 0) { error = zfs_do_rename(fdvp, &fvp, ap->a_fcnp, tdvp, &tvp, - ap->a_tcnp, ap->a_fcnp->cn_cred); + ap->a_tcnp, ap->a_fcnp->cn_cred, ap->a_flags); vrele(fdvp); vrele(fvp); vrele(tdvp); diff --git a/sys/contrib/openzfs/module/zfs/zfs_replay.c b/sys/contrib/openzfs/module/zfs/zfs_replay.c index 78be046f2262..d8b7c4e8a83e 100644 --- a/sys/contrib/openzfs/module/zfs/zfs_replay.c +++ b/sys/contrib/openzfs/module/zfs/zfs_replay.c @@ -710,7 +710,7 @@ do_zfs_replay_rename(zfsvfs_t *zfsvfs, _lr_rename_t *lr, char *sname, wo_vap, zfs_init_idmap); #else error = zfs_rename(sdzp, sname, tdzp, tname, kcred, vflg, rflags, - wo_vap, NULL); + 0, wo_vap, NULL); #endif zrele(tdzp);