From nobody Wed Jul 13 08:48:36 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 0E98117FC957; Wed, 13 Jul 2022 08:48:37 +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 4LjWVr72Zkz3Sbg; Wed, 13 Jul 2022 08:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657702117; 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=8yYOn796mQIqIe8LMH91COmxS/Bdee5lEa6m9AtWmmY=; b=ZCkP6+V4xpnqCy6waVUOqu9TtemD4N56SuNNcnY8c0BK2hODlq8r6Rj305uboMj2droRvv go4SXUiATFnrEy0+ZM0X5JlrFOZ4NbeA8IM/Uhb/i9rKZMTbO2OqnnyYkeRwH9Ysx9hfU+ is2JrBqeDwb8OlFwgLY+Wt4ZiemGknYSM/m0OPrPMuNgQVj9Bcy0XVJ9mMcU7qNVIOll+Y Ak7RlMUQN81vbxCShe/EV+ZMYJdHCtDFWCUnAhaGp353odytm2OdRUEwnkBu9C58QAdYBV p8O9Y5VQ/WBkwau/7N/TZCLCYdTtCbv1Uaqt8iZtQtHjbbI+1/VyQqNjzgWWdg== 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 4LjWVr68T5zHcD; Wed, 13 Jul 2022 08:48:36 +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 26D8maWc001448; Wed, 13 Jul 2022 08:48:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26D8maqq001447; Wed, 13 Jul 2022 08:48:36 GMT (envelope-from git) Date: Wed, 13 Jul 2022 08:48:36 GMT Message-Id: <202207130848.26D8maqq001447@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: a924a143ddfe - stable/13 - ufs_rename(): do not treat ERELOOKUP specially 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: a924a143ddfea5d1a70b693b39f48aaae521389a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657702117; 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=8yYOn796mQIqIe8LMH91COmxS/Bdee5lEa6m9AtWmmY=; b=cJ5rtTeUOieptkEzklB3c/UayTKSd8d/0iU8KuGs70Vbhsuk3VaUigyl4L6pJgKHGDQKO+ Asnbp8/9h/Y13RmVZz6woJfzldWNcv7hYSgSvYHG2EIRI7mSUG/IjwBp72s3THWWXzsPnU rrCwGniU+fjth7QkuMGfYMlzdUG1k0kxHDq41pYp/9XKBlTkGpsIOqGKLeQV7rd8rvysny 4v1BI03igi+NmfMEsx8Aem9Uo87asecdJ8fYT4MKAnlCjXC8zIDnUm9GDwt0AqvAv9qjoe aYWkaAa6MWmMa4pgT8IsIrE4LjcDwqSBMddBRH1V9i7AigV2Rso81BsrmjTKUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657702117; a=rsa-sha256; cv=none; b=NHLIk1q8maQf2+UlLo2DNJ64JENA35ZAs+qMmzMf3/S0T1N660lseBOciJXzLa5QGg8wLC wKiYl6gup+FvqQzCUQEEhEHRKag75fFklEqCnhNxJdc47S7Op/DAUud8qEbacD30tS3mhQ E4W1tI3Tpn4/cueux2Pjt/vijjMHNl3OinoXhnKKeMLoud/ITICDL0J3FZhOsIhy6NsKI8 NfWmGvlGv4rQovmocCRaj2bL/7v222EaH0nNu6Tk33yy2mw4E+AVGMfpWU8oaCL74jVLGK k1Ycbp1MSdq3sW+RRVNtg/lDGKVm02oaOQVMznopFnfJOTEaLEqiD4v5Z33PnQ== 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=a924a143ddfea5d1a70b693b39f48aaae521389a commit a924a143ddfea5d1a70b693b39f48aaae521389a Author: Konstantin Belousov AuthorDate: 2022-07-02 13:15:57 +0000 Commit: Konstantin Belousov CommitDate: 2022-07-13 08:38:01 +0000 ufs_rename(): do not treat ERELOOKUP specially (cherry picked from commit ab5ef5fb6355489e6a960b4d107e6767e2336ea2) --- sys/ufs/ufs/ufs_vnops.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 7938902676ca..06bde030d32f 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1411,18 +1411,8 @@ relock: (tvp != NULL && (seqc_in_modify(tvp_s) || !vn_seqc_consistent(tvp, tvp_s))))) { error = softdep_prerename(fdvp, fvp, tdvp, tvp); - if (error != 0) { - if (error == ERELOOKUP) { - fdvp_s = vn_seqc_read_any(fdvp); - fvp_s = vn_seqc_read_any(fvp); - tdvp_s = vn_seqc_read_any(tdvp); - if (tvp != NULL) - tvp_s = vn_seqc_read_any(tvp); - atomic_add_int(&rename_restarts, 1); - goto relock; - } + if (error != 0) goto releout; - } } fdp = VTOI(fdvp); @@ -1466,11 +1456,6 @@ relock: vref(tvp); VOP_VPUT_PAIR(tdvp, &tvp, true); error = ufs_sync_nlink1(mp); - if (error == ERELOOKUP) { - error = 0; - atomic_add_int(&rename_restarts, 1); - goto relock; - } vrele(fdvp); vrele(fvp); vrele(tdvp); @@ -1619,11 +1604,6 @@ relock: vref(tvp); VOP_VPUT_PAIR(tdvp, &tvp, true); error = ufs_sync_nlink1(mp); - if (error == ERELOOKUP) { - error = 0; - atomic_add_int(&rename_restarts, 1); - goto relock; - } vrele(fdvp); vrele(fvp); vrele(tdvp);