From nobody Fri Jul 7 01:15:46 2023 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 4QxwSf3hZCz4lCYC; Fri, 7 Jul 2023 01:15:46 +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 4QxwSf3Dttz3PwC; Fri, 7 Jul 2023 01:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688692546; 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=H4D31IHn/aLA0D31X3A77q0vn2FC584qoQtB0gDaRpo=; b=Z2yChLEYDzTkEaFCYWJ66tsuqNeLoh+I1CQS+UX/UBkmrRz0Hr31yS2rHLSLmpunIe31iC p1eS11gFPZzDuVlRGqiGbA9Kso8q40ARSZ01aVKSntnRVebRsXrwdfDSGcNrMj1mmZBc55 G9yz2v8L7DIIcDXa1wSO8tC3CXx6t4apJNa5kFWf75YMMFNy7tobD6TX7I9uVEg25MVMjX U1DtpvRMnmod5Afo4BGBMHJaE4ZxPQyR42ViGAipAqRaoEDobd0drN4jQSxzGLdpDBp49V ZWVFWCzCosQL+7kwmlug3Hn6bdSTeTgaRLUH53uJB3/M2Y6oYjtlQpR+vrdB4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688692546; 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=H4D31IHn/aLA0D31X3A77q0vn2FC584qoQtB0gDaRpo=; b=kiCRdUWqH03dCrM2API3Ras/0Nhe5DtdeXdyvFQy0wjXmGmtPCJc+xpkrRdhN1oLGrY8hR oXcrMSQWLghWdHH2qgM8ez6js8YTalel04TuftrEy92GUSXQ4xANQjVpc/6GJhsbH8vGQp Sg9RkP9lRNIl3jA4wofvUgPBENwBipj+mY8ERI+XhPNGPn0nrpVX31QrZK/AgXWEhACsmS wmHyyLZOKoM3CiZ+jojMA+mW1nTazDesXc6mi8W5uMi9Xk+r2s7iraD66OA/t5OiNzWQnF lZVadiuLLy+q9kMubIFo8GNs2Yd1pAP7hvEC7liq8LnyMBNSTtjr6I1yZ8V8ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688692546; a=rsa-sha256; cv=none; b=n+6I45HFMlCkyTLp8eJ67Y/UiNdOghDUn6aLy4mdqdIo3KvD6yHVLjtZKhi7ngk3Kz2TRs Jb1v+r++sKc1zeX3Fb8VZ0ZTSd13rRrW9ls9+3mNCY6f5Rzdh43xJe6RQKDe+RwNapqXS0 DCDoohtBOEjbgbJID2nsW1YOyEL6vxKpgsw9SqZN/kV4XLX5xVeE5JOfFZdtG/+JI0kg20 F6dIvRj/PmxjXIYn3Z4fs33hdyKRLbtK7w4tZNcYgXt93ZD3+UldlxRI5sV9nUTgfX1aRW GE3d3vD8mplsx14SZFD5AwQtZTS5dOMlSTCc8r/5oZqw/8huzgJiBD28pWlk0g== 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 4QxwSf2HY7zKKP; Fri, 7 Jul 2023 01:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3671Fk0f059696; Fri, 7 Jul 2023 01:15:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3671FkKr059695; Fri, 7 Jul 2023 01:15:46 GMT (envelope-from git) Date: Fri, 7 Jul 2023 01:15:46 GMT Message-Id: <202307070115.3671FkKr059695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: ebf37c3fed04 - main - vfs: drop LK_RETRY when crossing mount points in vfs_lookup 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebf37c3fed04f10d452b426cf83e741b6365a2ec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ebf37c3fed04f10d452b426cf83e741b6365a2ec commit ebf37c3fed04f10d452b426cf83e741b6365a2ec Author: Mateusz Guzik AuthorDate: 2023-07-05 22:56:04 +0000 Commit: Mateusz Guzik CommitDate: 2023-07-07 01:14:55 +0000 vfs: drop LK_RETRY when crossing mount points in vfs_lookup vn_lock already returns the expected error. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40883 --- sys/kern/vfs_lookup.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 588ef88d24df..5a5560a4c26f 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -1314,11 +1314,9 @@ good: crosslkflags &= ~LK_SHARED; crosslkflags |= LK_EXCLUSIVE | LK_CANRECURSE; } else if ((crosslkflags & LK_EXCLUSIVE) != 0) { - vn_lock(dp, LK_UPGRADE | LK_RETRY); - if (VN_IS_DOOMED(dp)) { - error = ENOENT; - goto bad2; - } + error = vn_lock(dp, LK_UPGRADE); + if (error != 0) + goto bad_unlocked; if (dp->v_mountedhere != mp) { continue; }