From nobody Wed Jul 6 12:35:20 2022 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 9FA711D10CA1; Wed, 6 Jul 2022 12:35:20 +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 4LdJsh3LHnz3vQC; Wed, 6 Jul 2022 12:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657110920; 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=Ws2g9Ea7G3SLcLH6hN0hbXvHg9CyltYKdFRpbJTCTEQ=; b=KZ3zRkxfhk9xqfeeR1EsBnN00yFni2BLLmI3DH2dGZeMX8zUIhm+mYedz7kR1GmN4GxY1Q cg58l8kgan+LCY/FjHAmT18J+dRWZJ7rpggevAcB5mwgO3UVfTyMW0uWXFxVl7yzreNTOw zgY2kQhONQj36Q95Eo1b4TqiJQwyW4SrdqW+us1EJkd2RU8m7ZtBYTcC+C/SSGDegeFjAu NklKJAJR2rN+oaRZ4yJ9Yh/osl4Q6DHEDn6ZuRTGEwmXB5Go1Kpf94/dTKneQGpNulYfQv KZ/1FgX6uTFrMeYxjGd8ZGB+SWlsZe/igETIqRSsPyIv82gq5HcHHXoXf8t7RQ== 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 507EC1A7AB; Wed, 6 Jul 2022 12:35:20 +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 266CZKON018182; Wed, 6 Jul 2022 12:35:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266CZKrp018181; Wed, 6 Jul 2022 12:35:20 GMT (envelope-from git) Date: Wed, 6 Jul 2022 12:35:20 GMT Message-Id: <202207061235.266CZKrp018181@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: 513e1bbc7392 - main - ufs_rename(): revert the bump of fvp nlink count in case of EMLINK for tdvp 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 513e1bbc739239c9479367b15e5f863a5f891d66 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657110920; 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=Ws2g9Ea7G3SLcLH6hN0hbXvHg9CyltYKdFRpbJTCTEQ=; b=b+ZldmztIR6uKALfh8ENrM1QiHWQfdPPJIZMbpHNUhmszVvl2HJXRHr1rkHzZe/PQXAJHq x0QociZUx9O0+2freN/9GcEfdTMmrkD5EOZHG1CVhFhw7SfG8x2vWaRQVqEVINGevZGvUJ Bs/qEMOGXO+78DszkwbMVWfgf1RTyMQaN686u04VHFqhI4uNYPmIbHCos06S25ssam+MOH Mu2EumGbFUiBCQs/KbQHhnmxByOqwUobKPpioFn/ldy87MTTTn7vTLDOomey5Kf9QATtwI G1dRkFtQLdIrqA/FBKpdPso1RHDYsRRyTLP5olrT2GRjOTApGsF/YflYxsrORA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657110920; a=rsa-sha256; cv=none; b=g5b1gwInqobjnqWX5zi6xE86yMi9ccVQev9eH4HgANV42QGEL92nIwqMfJ8rRD4vu/aPrx nVelVfN17PYEk8mXLabRYuj5NUSNY/inpA2q8Vmv7WdYpvFgbN0au97Yu0lFQhnCvv7l0k z+hCmxV0dT2EOghBvC5JvomxDwdvTu8JtLvWS/symNc+0ym6yHg2diO+N1TCdPg4idyx6m Ta5GI4Qc++Dz2LaRFfEIbBWDoynUFZcqo8xPjZMKPyktR4JPEROUH5BbOtGjxzT6Z5WDOr 06+1hUADFHwQZesgVw2uSkOityNPo7z/Xz1KMmHBs2Nadopvj14waB00qHpVgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=513e1bbc739239c9479367b15e5f863a5f891d66 commit 513e1bbc739239c9479367b15e5f863a5f891d66 Author: Konstantin Belousov AuthorDate: 2022-07-04 10:28:49 +0000 Commit: Konstantin Belousov CommitDate: 2022-07-06 12:34:36 +0000 ufs_rename(): revert the bump of fvp nlink count in case of EMLINK for tdvp Reported and tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 976bc31841dd..918b1e7ab29c 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1576,17 +1576,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);