From nobody Wed Jul 9 17:38:17 2025 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 4bclZ16932z60khm; Wed, 09 Jul 2025 17:38:17 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bclZ147SBz3J97; Wed, 09 Jul 2025 17:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752082697; 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=VXG/MtapaYAFJXfBJolAMGxbaUBcWb1CfTijACbOqqk=; b=v1Rv2JQ8JQMKGu4UwPh7eGg0aAixOyi2N74tzqQPvL+KNfxwXufc953TLuADeEEjdl75og UmUG0/aW3DdKUSwytQvLSmiVQ9sw862kylOW1sKmmUa7EWtI7s03iLZw8K6o4lUjKFiSin qijMIXVS17FtzX2bR0nBA7ujDLB8rTH3b7BYG8RKh4Lm63nt3ZFE2RcCiFAsObwV38DLO+ vJujJimowJyBT8EG3j7Q1N9kz0gGxlJDHlGqfTzXjt+4TYbBFfRUAGb6FOErRCMfRexSoN DuM4ygyayoI5AYVb5DewO09k5OLZsMIbiNuen6XzvdEb8IMFooZBYKDK2XJJkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752082697; 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=VXG/MtapaYAFJXfBJolAMGxbaUBcWb1CfTijACbOqqk=; b=b49Xjrn30pHsD2QJ3Ot8U0AHRDsSSP+YyARWMbkQFM+2SYg7ZV1wjEVcw4kIjr3i9WWKMo aH65WjrcU+JotB19mZGUBNUtPGRftsOh2xQxqZD5w3UD09tlir1Bwbw7jh05S7RYGLPg/+ Zv7fBvEN53l5WCcIdEPC5wnsclFqyz+Azq4rEXxEeG2ajoecI97QncSsPm8iO3J7wFjolO cbRNY2pFlDSBvbHvz1Pvy0nW9vfRq7S1wbg4YQHD8oBx2N/MtLbmU7hcOomtbO2ViqBll7 RwaaFo2t+JnphHlfTBEKHRufpX2d6eeK+40733ownDMUaXCubBR5j5s99zQiTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752082697; a=rsa-sha256; cv=none; b=WykGYxBtyr6il9avExlg0eKEpQFpQlMz9sV7ahExxn1GifghXzWzkG5UjAiGyYsCTPDx+8 12XPbz3ur8SDeop4r6NYVhqXIZlcQIj3GOQVq/BXZPcPgjY6Lm2JePovaWewd/Us4Jmhio 7wriQiuLkJaGTKxfrjbBQMLCeJ9lgEHuuFVnrob4rJzTjniYqVMA/Mj9869TqMkirthP4m dwcz4NLZDhXdRz/OO1F8msV3f20E9uPM2KT7sygMCZV1OZCU9UFO7dyYJ90jNiz3ZDmOw5 W1g5hzVLVumZkov0KkCVMAd9Xr5y7730wj3rdEDy0THhXyOIXi5tptJVpWBVPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bclZ13l2qzXrl; Wed, 09 Jul 2025 17:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 569HcHCY028654; Wed, 9 Jul 2025 17:38:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 569HcHkL028651; Wed, 9 Jul 2025 17:38:17 GMT (envelope-from git) Date: Wed, 9 Jul 2025 17:38:17 GMT Message-Id: <202507091738.569HcHkL028651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6280d03bb5fd - main - nfsserver rename: lock mnt_renamelock as required 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: 6280d03bb5fda4ba4a33a6e6faff2de34b2eda61 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6280d03bb5fda4ba4a33a6e6faff2de34b2eda61 commit 6280d03bb5fda4ba4a33a6e6faff2de34b2eda61 Author: Konstantin Belousov AuthorDate: 2025-07-08 19:53:55 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-09 17:38:11 +0000 nfsserver rename: lock mnt_renamelock as required Fixes: ef6ea91593ebff73e2fc201efd9f848b71c5a125 Reported by: des Reviewed by: markj, rmacklem Tested by: pho Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51211 --- sys/fs/nfsserver/nfs_nfsdport.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 95dc44438acc..43ee0383669f 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -1698,10 +1698,26 @@ nfsvno_rename(struct nameidata *fromndp, struct nameidata *tondp, " dsdvp=%p\n", dsdvp[0]); } out: - if (!error) { + mp = NULL; + if (error == 0) { + error = VOP_GETWRITEMOUNT(tondp->ni_dvp, &mp); + if (error == 0) { + if (mp == NULL) { + error = ENOENT; + } else { + error = lockmgr(&mp->mnt_renamelock, + LK_EXCLUSIVE | LK_NOWAIT, NULL); + if (error != 0) + error = ERELOOKUP; + } + } + } + if (error == 0) { error = VOP_RENAME(fromndp->ni_dvp, fromndp->ni_vp, &fromndp->ni_cnd, tondp->ni_dvp, tondp->ni_vp, &tondp->ni_cnd); + lockmgr(&mp->mnt_renamelock, LK_RELEASE, 0); + vfs_rel(mp); } else { if (tdvp == tvp) vrele(tdvp); @@ -1711,8 +1727,13 @@ out: vput(tvp); vrele(fromndp->ni_dvp); vrele(fvp); - if (error == EJUSTRETURN) + if (error == EJUSTRETURN) { error = 0; + } else if (error == ERELOOKUP && mp != NULL) { + lockmgr(&mp->mnt_renamelock, LK_EXCLUSIVE, 0); + lockmgr(&mp->mnt_renamelock, LK_RELEASE, 0); + vfs_rel(mp); + } } /*