From nobody Tue Mar 10 11:43:41 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 4fVX8F4NjCz6VWKS for ; Tue, 10 Mar 2026 11:43:41 +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 4fVX8F31Bkz49Vx for ; Tue, 10 Mar 2026 11:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773143021; 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=LiZqazwtjKJbu/Gs6vVxTzopWWs1Xoou4leDN908bqM=; b=bJCm7qvCCesF2ilJRFXrRFDtcLZyepbS/DGYuIMtDpNg8QceEauoMArOSnIpAjpuBNtrcb 1r7IdPjrr3aMaOkQNiJpfqNq3whW+5bVTKnjt+zsy5OQWWlXcQwR6OJhu48fyoUYmak1os 7mJRxlRNRyi2gJweZAj6nP3tXk+pC64AVH8c7+EqlvziI+fp81PV35r+bIBPsaWKmDRJQJ +3oVmVCADEtXuloPtCEuDt3efccRx+tB1CFyLmROhHq9zxNpp3nqIceoAUw5LdIXJLhhQg VAkQLIFO2gKkBEkip6pR6k2Ivz6HPPW86qfAxeA+pGDcrBKwG8s5Y00GVcJUJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773143021; a=rsa-sha256; cv=none; b=FBgZr6F4HGPJb93/7e0LYZFNfWiG9hkpUBA6T2C8F7RR1Phfqv7VBmMMtxIuPHmZFG1tID j8qla6x7kGO/QlDFriG85vWql9KZMxdp4bRwDNQlLTo3ZsXvd0eNDOTKkoIHsbNIAGrM0c +nGT6jsjfxCiNo59BtKuAoU+Sp+rGDY3lU7DULNj+wSIFCR0jYmT9ETLs/5MvB3nHnBN8+ 33bYC2otqD39BNin25904LS/vLkDwfmagQlAp6icZxYslFSuyE51bCwV29XZZy2f1Vhy0Z RgVUuXDBfAaBhs2V5iuIHK9qLcJh5ieyiXYKX+BSi5VT4nEoeB7wtzA19z/h2g== 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=1773143021; 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=LiZqazwtjKJbu/Gs6vVxTzopWWs1Xoou4leDN908bqM=; b=ny/nYgbeD7OlvkrYjDMv/2KAASykP0F4Qjx7Zrwp7xJBW3BslIOrXsmxs5vTTRcHYoe6M2 sgQh7t7T6d+RMjLvD83VcWE38bF4XvA+yTfXjidv9WDg5dk4EOA/+xvz4T9fgBGIw95I4S u8RKMzB2eqU7ap6gOGe/n2kWdr/tMszuZ1vNzDVGWVyh7QgjMLDerilDmnFd5P0MDAWlHU bQBwc7pWu5k3INIOnGolYZY0yvO/RklPiN/CYYRRzAMRvcLMYJviRBYyaDtN385IW5fPaD 6l00XVHMCYYycK83NFnrBMgI8RTvXXlxIKhxYLzxBP4YHLr24rCbZZHiG4mJAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVX8F2Yjjz19H7 for ; Tue, 10 Mar 2026 11:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1df82 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 11:43:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 72cf8b9e680b - stable/15 - zfs: implement 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: 72cf8b9e680b65cd07e883a3a872d38825f267c5 Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 11:43:41 +0000 Message-Id: <69b003ed.1df82.8f7e3a0@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=72cf8b9e680b65cd07e883a3a872d38825f267c5 commit 72cf8b9e680b65cd07e883a3a872d38825f267c5 Author: Konstantin Belousov AuthorDate: 2026-03-01 13:16:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-10 11:41:31 +0000 zfs: implement AT_RENAME_NOREPLACE (cherry picked from commit 7a1217ff3bbdd1ef40d1b94170c53611fadeb026) --- .../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 ed4aa19b96e5..1b3eeb4353fe 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 @@ -3247,7 +3247,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 @@ -3258,6 +3258,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 * @@ -3269,7 +3270,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; @@ -3298,7 +3299,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: @@ -3313,7 +3315,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; @@ -3422,6 +3424,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. */ @@ -3542,7 +3549,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; @@ -3574,7 +3582,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); @@ -5518,12 +5527,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);