From patchwork Tue Mar 24 19:16:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1260924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=HsK1NfGo; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48n1GD2lznz9sQt for ; Wed, 25 Mar 2020 06:17:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6956F87E6E; Tue, 24 Mar 2020 19:17:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zUgjVHEO+RY8; Tue, 24 Mar 2020 19:17:05 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 3BF3881090; Tue, 24 Mar 2020 19:17:05 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 20B97C089F; Tue, 24 Mar 2020 19:17:05 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8772AC0177 for ; Tue, 24 Mar 2020 19:17:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 76D6F85A80 for ; Tue, 24 Mar 2020 19:17:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2ozPQLkPVkIk for ; Tue, 24 Mar 2020 19:17:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 1005B84EF0 for ; Tue, 24 Mar 2020 19:17:04 +0000 (UTC) Received: by mail-pj1-f66.google.com with SMTP id g9so1917428pjp.0 for ; Tue, 24 Mar 2020 12:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=DyDfuoWEcBNmIbqDKe8L9enY4a18GK84WWdiwmgfsvo=; b=HsK1NfGoRHb7glgAl38ayc6OhY8rcblN2wtf5jjSF+xICOwqg6E1KBgFSk5pq+/y5t aCuounEZibH5ao7BRDtNJM56sBP8LIWZuVcoG2f/yLSCP4OpFMKQMsF1XX7Y3c3nRreB FOgDCcwFgCc8uO2/bRFHVxoRGNqmn7bkiXapzmRwph+HbgHZG54EHgb7fNwbgZio3Ob7 2I2fWNG5l3NYZSX5F7s0SrDGB9OcDs+VVf7Ku8zljGfm+8rl+ZrGVkgEMDEyKLJLeBih ZWOOhPZUxI6jsn8ne+sjHT7EDzG9H+styadEJi1v6Te0N9c7IsWeeBr5irVB/BX+/hZq IstQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DyDfuoWEcBNmIbqDKe8L9enY4a18GK84WWdiwmgfsvo=; b=htPhKWNM60hXHM7de14KHuzUPBrfrlKqb7uL/Je2rijbuys45dbZZYnLpXX1EsyB1c UjnF5En1zsyLRLjev3xO6BMW4MakQVbtsCvhdlaIK8leOC+b1AAAjLlXla/aNICjOdzu RsYD04Vyn/h3lwBlnmkiMjkYFMlY7yU6QfYH0rV8s+bPRZQvCw3X4ZxO8z5BdAf7zVO1 XadSxN2Kigk1Eq/oB2yX1gFlnFuB5jp0JggX1rgBwIuReVYt5kQ5yKPneTM+sLgUhApY q5IXXDLNFUoexjdJ7DvOMmauL3AvMIXpK8uZhxLqu4G0J/7rFlzX0VbpNYbJ1LDFP5qy KaWQ== X-Gm-Message-State: ANhLgQ2pZaKY64K+euitf/xPlMwO8aWMlRkkR1feOSPgPOUo8RQNtrUN gGDEfAozVHkB7myfEpU5PhkRDIqh X-Google-Smtp-Source: ADFU+vsgVJnOsyzkAxGlh+KtHdcnLJUQOQC11WPRwforsLJxF9RTGn920lEXe4LCv+QL5LTns4EjkQ== X-Received: by 2002:a17:90a:3481:: with SMTP id p1mr6959896pjb.69.1585077423327; Tue, 24 Mar 2020 12:17:03 -0700 (PDT) Received: from sc9-mailhost2.vmware.com (c-76-21-95-192.hsd1.ca.comcast.net. [76.21.95.192]) by smtp.gmail.com with ESMTPSA id r17sm4523303pgl.80.2020.03.24.12.17.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Mar 2020 12:17:02 -0700 (PDT) From: William Tu To: dev@openvswitch.org Date: Tue, 24 Mar 2020 12:16:38 -0700 Message-Id: <1585077398-106736-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [ovs-dev] [PATCH] vlog: Fix OVS_REQUIRES macro. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Pass lock objects, not their addresses, to the annotation macros. Signed-off-by: William Tu Acked-by: Ben Pfaff --- lib/vlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vlog.c b/lib/vlog.c index 6d17d4837e9c..ee6b0d3a620a 100644 --- a/lib/vlog.c +++ b/lib/vlog.c @@ -257,7 +257,7 @@ vlog_get_level(const struct vlog_module *module, } static void -update_min_level(struct vlog_module *module) OVS_REQUIRES(&log_file_mutex) +update_min_level(struct vlog_module *module) OVS_REQUIRES(log_file_mutex) { enum vlog_destination destination;