From nobody Wed Jul 5 13:45:11 2023 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 4Qx1BH5qSPz4lQwP; Wed, 5 Jul 2023 13:45:11 +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 4Qx1BH5Gk6z3PS0; Wed, 5 Jul 2023 13:45:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688564711; 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=MwHDyeRTv7JfqGB+HlXVMuCVTiGumf2lHwdojO3dp0M=; b=fgB8poz6ztJv+hmK2jEFgcp4KxDkgkQEB5L4civCAvv4pofnFj/GVNmLnEamMKviPhEISS v+UMXCvmwk3JfL3BlYHPxnvTA3r98oYbUeTHcjdv4hXvV93lEFjO7iEao8E3AcK3NNXrpw LizeNEn4sbUGjFD0rXbA6fSihy42xlCWD3xwqJFjW2fRT6mV0xk5WaKbajqv9CCmtuCWPr n10FE8AKqBNQPCyTNb1SYw0IK1q0vaRzQFp3dZBX11y1zp4Wektw0MCqyVfwHO72RHXdMf XSNZaXGshfDKlFyA+quKzTveesI15kOgds5pkxKQnaCX+qc5u4VKUIxE6I7NUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688564711; 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=MwHDyeRTv7JfqGB+HlXVMuCVTiGumf2lHwdojO3dp0M=; b=Y2OS4FktFgvyXX+tSzpyOkXXiQ8fNwwcQ0kslr+DQwAz7UjiFQbiBfp/L0FhFw1tCtscLN aL7logCAKKRB4tp0+G8D3/3gz+3/DL7JZWRCFrd4Em1dXR78FtmI3qg+uFZxZFKTBAHzMy hfExK0ClHOXI+2bd3DvFb9SyFHbkMbWYhqKx1jvb9pb+RLJOgib/pChqGRmUiTR685m54H bHqh+TdkhHpXTEr3T3yom0q3GNEfF48edE3CHpigbZhC3in/z+qjeFqQPGQIc6lnti9KGS k7Cynq+XYMD5svtNzVYFeDT72TuWCInDxUiNy785J9V7SJaijrd2TWlhWslzzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688564711; a=rsa-sha256; cv=none; b=AcgNbz4gfIQKli56Gzyet9nnAntw2+SaP8qmeL7XxShBxOGnnC3yWqRgQfbyuBG09vTKDi bkMiUbTIhN8W53faojDywoZPOUblszSqB7ssonTTaq0gHlPRRXWxo4scMcME+uky3aOlXu BeLuWlTe+cPYE+MhasLpcTJP2O32e8WuYLFerqOuf/YvonVYDQ0GfnnSKHXXl/0qK+HAp8 GsD9pfXrJ/88GnuQhNL+dukMawL49ahXWfD2VF/ANf9m54wkE6/EZXRSoOEr/2i1mVLpos Pt4+qSiILEMBo67wXtwgJ3dcdFRAuMgzUTvSfVEyD2wZRi+Vao05i6KmpvW9yg== 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 4Qx1BH4M6xzHVB; Wed, 5 Jul 2023 13:45:11 +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 365DjBCv036003; Wed, 5 Jul 2023 13:45:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365DjBWF036002; Wed, 5 Jul 2023 13:45:11 GMT (envelope-from git) Date: Wed, 5 Jul 2023 13:45:11 GMT Message-Id: <202307051345.365DjBWF036002@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: 5842f73dbc2a - main - vfs: compute_lk_cnflags(): Remove unused argument 'cnflags'; Rename 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5842f73dbc2a4408f63da37623096ddfb0c84bc1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5842f73dbc2a4408f63da37623096ddfb0c84bc1 commit 5842f73dbc2a4408f63da37623096ddfb0c84bc1 Author: Olivier Certner AuthorDate: 2023-07-05 13:40:22 +0000 Commit: Mateusz Guzik CommitDate: 2023-07-05 13:43:38 +0000 vfs: compute_lk_cnflags(): Remove unused argument 'cnflags'; Rename Argument unused since commit 93a0ba8f4990785f. Rename it to enforce_lkflags(), which seems to more aptly describe what it does. [mjg: massaged the commit message a little] Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D40848 --- sys/kern/vfs_lookup.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 73df48e96efe..44fc91c1bd11 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -748,7 +748,7 @@ out: } static int -compute_cn_lkflags(struct mount *mp, int lkflags, int cnflags) +enforce_lkflags(struct mount *mp, int lkflags) { if (mp == NULL || ((lkflags & LK_SHARED) && @@ -815,9 +815,7 @@ vfs_lookup_degenerate(struct nameidata *ndp, struct vnode *dp, int wantparent) cnp->cn_lkflags |= LK_EXCLUSIVE; } - vn_lock(dp, - compute_cn_lkflags(mp, cnp->cn_lkflags | LK_RETRY, - cnp->cn_flags)); + vn_lock(dp, enforce_lkflags(mp, cnp->cn_lkflags | LK_RETRY)); if (dp->v_type != VDIR) { error = ENOTDIR; @@ -1009,8 +1007,7 @@ vfs_lookup(struct nameidata *ndp) * we adjust based on the requesting flags. */ vn_lock(dp, - compute_cn_lkflags(dp->v_mount, cnp->cn_lkflags | LK_RETRY, - cnp->cn_flags)); + enforce_lkflags(dp->v_mount, cnp->cn_lkflags | LK_RETRY)); dirloop: /* @@ -1149,8 +1146,8 @@ dirloop: VREF(dp); vput(tdp); vn_lock(dp, - compute_cn_lkflags(dp->v_mount, cnp->cn_lkflags | - LK_RETRY, ISDOTDOT)); + enforce_lkflags(dp->v_mount, cnp->cn_lkflags | + LK_RETRY)); error = nameicap_check_dotdot(ndp, dp); if (error != 0) { capdotdot: @@ -1196,8 +1193,7 @@ unionlookup: vn_printf(dp, "lookup in "); #endif lkflags_save = cnp->cn_lkflags; - cnp->cn_lkflags = compute_cn_lkflags(dp->v_mount, cnp->cn_lkflags, - cnp->cn_flags); + cnp->cn_lkflags = enforce_lkflags(dp->v_mount, cnp->cn_lkflags); error = VOP_LOOKUP(dp, &ndp->ni_vp, cnp); cnp->cn_lkflags = lkflags_save; if (error != 0) { @@ -1213,8 +1209,8 @@ unionlookup: VREF(dp); vput(tdp); vn_lock(dp, - compute_cn_lkflags(dp->v_mount, cnp->cn_lkflags | - LK_RETRY, cnp->cn_flags)); + enforce_lkflags(dp->v_mount, cnp->cn_lkflags | + LK_RETRY)); nameicap_tracker_add(ndp, dp); goto unionlookup; } @@ -1303,8 +1299,7 @@ good: KASSERT(mp != NULL, ("%s: NULL mountpoint for VIRF_MOUNTPOINT vnode", __func__)); crosslock = (dp->v_vflag & VV_CROSSLOCK) != 0; - crosslkflags = compute_cn_lkflags(mp, cnp->cn_lkflags, - cnp->cn_flags); + crosslkflags = enforce_lkflags(mp, cnp->cn_lkflags); if (__predict_false(crosslock)) { /* * We are going to be holding the vnode lock, which