From nobody Wed Jul 6 12:35:19 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 5D7E61D10A74; Wed, 6 Jul 2022 12:35:19 +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 4LdJsg29nCz3vMd; Wed, 6 Jul 2022 12:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657110919; 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=PZFP7sG07JTgZgGZjq/l+Pz/8Hmsy7JjrOotnykcVac=; b=evjkW1tzZJ8dFPy/Jok+M3oQ2Lplu+13+h8OGLAMa538cXOKbbZ9Gl7DL9sYo+rRgxSA1e DKXi+Inpg3mcQC6xWRKN6SDZg6iz4j6Xljgp9Dz19WJLR4xlWczWwIx9564zjWez/oYQBA MppX+1gTgT4zVSJsFpZL51Kve9OAc+IJNWCXVcW/au1dRA1N/g1/6p667zVfQrls4yDFE+ qwDpVfUIaKw3q9S69XkNPtY58SVaA/OEH7e79efju3Qq2raR2a62mW6vwjIoOwaliA8Ca7 +19GcQT5QFsDJwFo1Mfg104in/S7pMY/JWCIlM43Cqmd0fMVniVBxvZ0xLJgvg== 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 2BD6A1A7A9; Wed, 6 Jul 2022 12:35:19 +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 266CZJvk018158; Wed, 6 Jul 2022 12:35:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266CZJmb018157; Wed, 6 Jul 2022 12:35:19 GMT (envelope-from git) Date: Wed, 6 Jul 2022 12:35:19 GMT Message-Id: <202207061235.266CZJmb018157@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: ab5ef5fb6355 - main - 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/main X-Git-Reftype: branch X-Git-Commit: ab5ef5fb6355489e6a960b4d107e6767e2336ea2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657110919; 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=PZFP7sG07JTgZgGZjq/l+Pz/8Hmsy7JjrOotnykcVac=; b=gga3GrLs+L4CaYBzeUouLrnmqB8F84l1afgxknwLY8d4LJHOeXAbq/EYyUhS5+GbQBqfKa lZwHGaCS54KrdZMkj19h6qsHg/bBG5O3yBfEWq4hotOF9Z7eCJHtvFYuDx946vWgNrhj7v ijLZKjCuQ7keJJ6rWhdGqv51A4CTlRAuFsEfH0+es4FLQgTBkRBWiQgA8/5nKccyfaC2kJ AfghumcgpqQiWVvHMVmcQpX06aQ5h4cLhLSRm31jS4czZYZlnFBy2ltvG9mGmlhMZjJQgk SitenjNrOM4LX3UQB3m5YY0373Pf3WM3hmIsNQ9wUuybnaAC2+V9FCLLRy3B+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657110919; a=rsa-sha256; cv=none; b=OTfDRn+B3qd3cfiZ2ZfxgLhBHGS7L8Z5mG5p1DgRzZAk1VTZKsB+Qq02op4/mIl7G9aByh zQ59LMzAMO5hRf7IVniqR5YggU39hp41xMkOxRnAFAL6k0JtWvltOAWsStllN4DJvaae9w 8pPtyd+VSAwSjN0klxccHDJihg9BveOPYjP6kXzHJiu4DbPnmNT7lkT8XX/lGyxTLsjsnX NlIWMDPts5b7RtVw+TzOvQEcl1A+nSS5vPK9ZUubTZtPz3edhmiS54COrT/dBTudgu5hAK BOp9IhFxBXpCxxIFDoVqrLHg6IyiwTBoOusP2UvITOR4yjMg+RudQ6+p+3fqVQ== 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=ab5ef5fb6355489e6a960b4d107e6767e2336ea2 commit ab5ef5fb6355489e6a960b4d107e6767e2336ea2 Author: Konstantin Belousov AuthorDate: 2022-07-02 13:15:57 +0000 Commit: Konstantin Belousov CommitDate: 2022-07-06 12:34:28 +0000 ufs_rename(): do not treat ERELOOKUP specially Delegate handling of it to the top VFS layer, as it is done everywhere. Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 7e54cf3916c8..976bc31841dd 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1412,18 +1412,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); @@ -1467,11 +1457,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); @@ -1620,11 +1605,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);