From nobody Sat Mar 12 12:14:31 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 76D091A0492C; Sat, 12 Mar 2022 12:14:31 +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 4KG1vC2vs6z3Mts; Sat, 12 Mar 2022 12:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647087271; 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=3Wpvcfsw4NMnBH/gpu+17//E3aoZiWMphGOckxYcyqk=; b=f31hBKoYV2MD707wBXUbOHHTvljaPhHRG5IkeraeOCSKoyZbjKWSU59aGEVHnez0/wdSXN 37SClUqFARXdU5wlLnNOP2tSAEOcYeGqz5hbXMmjnaX6I1dYArM2eKUGxRA6Hm5ChVxWTl w7h2LQlDYQzWqaDMRCt92XGHuMN6LqfxZkHjmOd0jlfK3WQve/DKMHlm0NWYvgT0aYkEmj 9+UP5YSrA7iRj1Fne2e4N8aIa8/E5drdfAmNcum58Hz9Hqex7nfKBT4VYhGqK4LIXjOkJ+ EP/QLHwR+57tlzz1GNI9bnRp2ifsimfCLU8piEeMMwjhDU2BE+/5YXPZLIgQ1g== 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 43BD72CAEB; Sat, 12 Mar 2022 12:14:31 +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 22CCEVau078754; Sat, 12 Mar 2022 12:14:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22CCEVX3078753; Sat, 12 Mar 2022 12:14:31 GMT (envelope-from git) Date: Sat, 12 Mar 2022 12:14:31 GMT Message-Id: <202203121214.22CCEVX3078753@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: 381dd12cea17 - main - vfs: stop evaluating the argument multpile times in stat macros 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: 381dd12cea1715940b1f8f95f28614d664b020ad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647087271; 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=3Wpvcfsw4NMnBH/gpu+17//E3aoZiWMphGOckxYcyqk=; b=iBxcJi1IXqYBfWJuGvw778YHAbPs8KQq3ww3l+gjaWubD35oBl0BAlkzipYLOjnLqmt1Py h+vWStTqtX4dy4COJBhwey3LAvgdTaXKuBRvUyLKW9IZF+s7GmS5Z7uBJGVfwBbHoqVENd qVo1ndQE/7H4r/0LAdOUTfkPMeAUGcdF2qzJAzBURMLz8criQa7NZ5BWx3PRvUSydXKLdN Ebi07hkYC71hYIt54ROiNI5+OdeAR8gMMkv/uLXfE6s9AeNTviptZb3+a75UJFCsMRdA0m 95NMEH8/jBwA0DqspKbDoCqsJzBHg+q95sP6V7uj8YW7VLtLCf2hEddntjrKog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647087271; a=rsa-sha256; cv=none; b=oGXF2eRCiaPq+GbtFTh8mOk9WzLUJFMQID5qOnQLF+Mpl3ZcRO9LpYpC4GZd6XsO0lfQC+ 7xYmaOTl3aUAHdcva/ObWUZzzvyVOXQmIlvrXXZIonF32ydKopD10ILnEI1Qt3Eqbvrhht jgYxi8TNnZauN9K9fSkf4qClNQ9DhOq3mim6Cy/h8HFgVxhSmGya2rnMCtRObIYjx1fFKx HdnWzlUn2/Lh4k47JuD1ooPW5BlDvBMB6jdPn9KSrQhL6c5c8V+ZPu9iKt6zFA4w8akGiM v61N3kTazSknnOzUXcnCMubz0OSLeiNdXwbr06owjip9reswzK+1kYP2ko6NNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=381dd12cea1715940b1f8f95f28614d664b020ad commit 381dd12cea1715940b1f8f95f28614d664b020ad Author: Mateusz Guzik AuthorDate: 2022-03-12 11:47:07 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-12 11:47:07 +0000 vfs: stop evaluating the argument multpile times in stat macros --- sys/sys/vnode.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 6e8373379587..f595029bdd14 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -966,18 +966,20 @@ void vop_mkdir_debugpost(void *a, int rc); void vop_rename_fail(struct vop_rename_args *ap); #define vop_stat_helper_pre(ap) ({ \ + struct vop_stat_args *_ap = (ap); \ int _error; \ AUDIT_ARG_VNODE1(ap->a_vp); \ - _error = mac_vnode_check_stat(ap->a_active_cred, ap->a_file_cred, ap->a_vp);\ + _error = mac_vnode_check_stat(_ap->a_active_cred, _ap->a_file_cred, _ap->a_vp);\ if (__predict_true(_error == 0)) \ - bzero(ap->a_sb, sizeof(*ap->a_sb)); \ + bzero(_ap->a_sb, sizeof(*_ap->a_sb)); \ _error; \ }) #define vop_stat_helper_post(ap, error) ({ \ + struct vop_stat_args *_ap = (ap); \ int _error = (error); \ - if (priv_check_cred_vfs_generation(ap->a_active_cred)) \ - ap->a_sb->st_gen = 0; \ + if (priv_check_cred_vfs_generation(_ap->a_active_cred)) \ + _ap->a_sb->st_gen = 0; \ _error; \ })