From nobody Wed Jul 13 08:48:37 2022 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 2EB5F17FCC17; Wed, 13 Jul 2022 08:48:38 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LjWVt0mRfz3ShN; Wed, 13 Jul 2022 08:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657702118; 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=kghZdRV4BodygBFd4CFuvB93TflVcv9H1ftAofbmnZ4=; b=GiiT5ajL7TcILOAehxcTFM2+Kv6Vs6E5P/YNFGhJ9QTsPxDnuLlTG2bymgijHVEsuSfcBy W5NwFk5PmQzYGMzs2ZIC20b1pe3vUMMxPgJX3lzPKvQ2mpYLwDtg+N5F0nrhDmIKsy4gG5 8c42dffUA5fWqQ2Xr8w2x2P72YJDKBAQFOiqB5fZuUo0hNrTrYJaB8ZjFE+6SxUmz6Xg5y 4b5ztkrxGn3wqIQwrkY1ooEfTqT+J5whhxsSPfS3j/rqhqNuBF+XPGCFrAExJKXrRjOTU+ 5CA66Wg4uE/6UKnv0D3fhwi800cHdya1E+SZhVSG2hK+l1YmQbzrup8X1hanHg== 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 4LjWVs6zrFzHS2; Wed, 13 Jul 2022 08:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26D8mbDY001472; Wed, 13 Jul 2022 08:48:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26D8mbl4001471; Wed, 13 Jul 2022 08:48:37 GMT (envelope-from git) Date: Wed, 13 Jul 2022 08:48:37 GMT Message-Id: <202207130848.26D8mbl4001471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c41bc565749d - stable/13 - ufs_rename(): revert the bump of fvp nlink count in case of EMLINK for tdvp 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: c41bc565749dc2947ca1f719de5957b796db1553 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657702118; 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=kghZdRV4BodygBFd4CFuvB93TflVcv9H1ftAofbmnZ4=; b=IfLO3hKIhp0c+2GANmZnzIgACB/Q7WeVQ5S4SgGKyySBmJo3Wip6vg/NTsfpkozgaAAYqX lnRiQ6TWy6M8l8/BsyjZGirKdMhAeejmBfWOEouHdzs3f8QO1RanC98746GEDBNsnGs0cV NAtrqY2yheBRNfJjNpRKAiDEpsoNB1v7YBUeuIqzslec44lCzw7B/Oi8XBw87GvMCYuzlW rf3gep4tBJgRog1mtjerugi0gde/3wCoXd9DI0YbYVIGYtFWFsa+ielYwwBMSRjlnlTjNQ YTG94zLl/2OJXaSboWF6pjgb4b7q0izLR+8z8JuGkb5WnAsVCQ3XrP8bcS/a2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657702118; a=rsa-sha256; cv=none; b=mgvazVxzoYSnVW5uwnNAt9bLwOMab8dvIQgDoneY9QteKzc9DxsXUyNm0B3Cp0oDXb1AjI BLdUXJYiZG4O/EF1s0TBHBTHHpLqgKTbKdWD7+9WL9k33JXUibKGk8mzn+FYEfpcnJpdfE R3Nn3/vn/Mvww877bHtMLiFL4pLgTFr6ygrkGIEnufDFnfqdl3yRjVgs24r3EefssDLtoc UMFjYVPHGeqf7G53beUyMaRjfwL5jM6LomiCsjya1qApe7uMkcXr0XE1jrfAS+tBF16UVZ UPfEFEnfzVPalYaGFQt9sjk4kjKgSQ1oRmKPezPYXFU5K1DKwq2j3C34dbaVFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c41bc565749dc2947ca1f719de5957b796db1553 commit c41bc565749dc2947ca1f719de5957b796db1553 Author: Konstantin Belousov AuthorDate: 2022-07-04 10:28:49 +0000 Commit: Konstantin Belousov CommitDate: 2022-07-13 08:38:01 +0000 ufs_rename(): revert the bump of fvp nlink count in case of EMLINK for tdvp (cherry picked from commit 513e1bbc739239c9479367b15e5f863a5f891d66) --- sys/ufs/ufs/ufs_vnops.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 06bde030d32f..35639957badb 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1575,17 +1575,17 @@ relock: * .. is rewritten below. */ if (tdp->i_nlink >= UFS_LINK_MAX) { - if (!DOINGSOFTDEP(tdvp) || - tdp->i_effnlink >= UFS_LINK_MAX) { - error = EMLINK; - goto unlockout; - } fip->i_effnlink--; fip->i_nlink--; DIP_SET(fip, i_nlink, fip->i_nlink); UFS_INODE_SET_FLAG(fip, IN_CHANGE); if (DOINGSOFTDEP(fvp)) softdep_revert_link(tdp, fip); + if (!DOINGSOFTDEP(tdvp) || + tdp->i_effnlink >= UFS_LINK_MAX) { + error = EMLINK; + goto unlockout; + } MPASS(want_seqc_end); if (tvp != NULL) vn_seqc_write_end(tvp);