From patchwork Fri Sep 11 22:47:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 517042 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id BBB42140772 for ; Sat, 12 Sep 2015 08:47:42 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 800BB10D7E; Fri, 11 Sep 2015 15:47:39 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 03D7310D68 for ; Fri, 11 Sep 2015 15:47:38 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 8A8A21E02EA for ; Fri, 11 Sep 2015 16:47:37 -0600 (MDT) X-ASG-Debug-ID: 1442011656-09eadd2a4136ae0001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id aQvfwLJfrBdgHNhJ (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 11 Sep 2015 16:47:36 -0600 (MDT) X-Barracuda-Envelope-From: joestringer@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pa0-f42.google.com) (209.85.220.42) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 11 Sep 2015 22:47:36 -0000 Received-SPF: unknown (mx1-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.42 Received: by pacfv12 with SMTP id fv12so88033355pac.2 for ; Fri, 11 Sep 2015 15:47:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=SrtDRt3c/pJ77BrjRP1+A5RGvt95KTazYYhGPVp9+Lg=; b=h1EB0FiDUCdUDLWPJLVLs8zdH3NFUVi+6Yq+AKuIikBiwx3pHsQkdamR9amdBhA/qp z8nr26lg5pBzv9n35BWSiKzpLNuOGy+wMHqMVuiiZBZq8ir+GFC9Cxhs23wVhEcJ+uhn sKpAEVnQ7SANkl0grdE/9+QJL0Ja0nTnu4GzvybDV8WSoEG2KdN2RqkilP9g8EYnker4 L88ATRqlk+At8TrBS/wPwkwXlOsi+mqoTapzefZKnfXx8U2ZC7L+TNttQ+U47OBT+N42 RPPQR7mJYeWbO/TbYx1WI272aq05BO2SfLChJ3Z+/yLegEAj2BJPbRwllSenIFYw61ak l1Cw== X-Gm-Message-State: ALoCoQnk4EXAmzkmuqLbSqWOhmHGK8IvsXE3+BT/f0PM1PWRqmUvQrWrTjRI8RIA9PtrbWXy1D1C X-Received: by 10.68.98.194 with SMTP id ek2mr2598073pbb.152.1442011655665; Fri, 11 Sep 2015 15:47:35 -0700 (PDT) Received: from localhost.localdomain ([208.91.2.4]) by smtp.gmail.com with ESMTPSA id ns3sm2274432pbc.77.2015.09.11.15.47.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Sep 2015 15:47:35 -0700 (PDT) X-CudaMail-Envelope-Sender: joestringer@nicira.com X-Barracuda-Apparent-Source-IP: 208.91.2.4 From: Joe Stringer To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-910084874 X-CudaMail-DTE: 091115 X-CudaMail-Originating-IP: 209.85.220.42 Date: Fri, 11 Sep 2015 15:47:26 -0700 X-ASG-Orig-Subj: [##CM-E2-910084874##][branch-2.3 2/2] ovsdb: Fix compilation of ovsdb/transaction.c. Message-Id: <1442011646-50005-2-git-send-email-joestringer@nicira.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1442011646-50005-1-git-send-email-joestringer@nicira.com> References: <1442011646-50005-1-git-send-email-joestringer@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1442011656 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [branch-2.3 2/2] ovsdb: Fix compilation of ovsdb/transaction.c. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" The branch-2.3 backport of master commit eac0dc83c468 missed some changes required to build on the older codebase. Fix the issue. Fixes: b2235a2f4d4c ("ovsdb: Update _version more accurately in transaction commit.") Signed-off-by: Joe Stringer --- ovsdb/transaction.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ovsdb/transaction.c b/ovsdb/transaction.c index 18ff12b..8e64f79 100644 --- a/ovsdb/transaction.c +++ b/ovsdb/transaction.c @@ -746,8 +746,8 @@ check_index_uniqueness(struct ovsdb_txn *txn OVS_UNUSED, return NULL; } -static struct ovsdb_error * OVS_WARN_UNUSED_RESULT -update_version(struct ovsdb_txn *txn, struct ovsdb_txn_row *txn_row) +static struct ovsdb_error * WARN_UNUSED_RESULT +update_version(struct ovsdb_txn *txn OVS_UNUSED, struct ovsdb_txn_row *txn_row) { struct ovsdb_table *table = txn_row->table; size_t n_columns = shash_count(&table->schema->columns);