From patchwork Mon Nov 17 18:32:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 5323111 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2511FC11AC for ; Mon, 17 Nov 2014 18:32:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 61CD42011D for ; Mon, 17 Nov 2014 18:32:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6039F20127 for ; Mon, 17 Nov 2014 18:32:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751809AbaKQScY (ORCPT ); Mon, 17 Nov 2014 13:32:24 -0500 Received: from mail-qc0-f181.google.com ([209.85.216.181]:55416 "EHLO mail-qc0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751445AbaKQScY (ORCPT ); Mon, 17 Nov 2014 13:32:24 -0500 Received: by mail-qc0-f181.google.com with SMTP id m20so4075240qcx.12 for ; Mon, 17 Nov 2014 10:32:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=wznjVp6SHPU8xblow2pc3HnqlP9IIflRnHHI66jpjQM=; b=PAT8689aAXJMgL+fNleAnyyAtQwb8wpaUy5yZyxsUi3tZDAUE+MGGPmD74KNPNIFj/ VN1a7f1n6xiy7VLFQiaIiKwN0loAFCCmQ/+ZLuBExzO68Khz0YRnqU9Xey1SiduxD/Yz GbpdBLg1c9LkBdTw6Ftlz4hf03D4gbEgVfGCgB3y2f4DZOblfxML/U5zJ12B6CYFMLRr E23qG4e/we+6vvpXea+Sl60tPUww8p+m8Cxmw/7uw7hokKRcg8Trc0Y8EgyyC2Mlg76K McbFGRxBlNtoO2KlCjIDdCGFgHXTWR8e1aYMRPi7z7t8/R7qe1Txt3O+CYbELexUD2S8 qugA== X-Gm-Message-State: ALoCoQmsER/nur7V9EP3ykO+vvFEqbQvgW9lsFJl2rnWjNURTZDFzNB+VxQK1rbhU/lVYU9CbaNL X-Received: by 10.140.17.67 with SMTP id 61mr35999621qgc.59.1416249143369; Mon, 17 Nov 2014 10:32:23 -0800 (PST) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id r4sm34944223qan.31.2014.11.17.10.32.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Nov 2014 10:32:22 -0800 (PST) From: Jeff Layton To: chuck.lever@oracle.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH RFC 1/2] nfsdcltrack: use sqlite3_close instead of sqlite3_close_v2 Date: Mon, 17 Nov 2014 13:32:14 -0500 Message-Id: <1416249135-18736-2-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1416249135-18736-1-git-send-email-jlayton@primarydata.com> References: <1416249135-18736-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP sqlite3_close_v2 wasn't added until v3.7.14 of libsqlite3 so this causes the build to fail vs. very old sqlite3 libs. Also, Chuck points out that the documentation says that sqlite3_close_v2 is intended for use with host languages that are garbage collected, and C isn't. In practice, we shouldn't ever see sqlite3_close return SQLITE_BUSY here anyway since the program is single-threaded, so sqlite3_close should be fine. Signed-off-by: Jeff Layton --- utils/nfsdcltrack/sqlite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c index fb45c4af5edb..7cac89ef459f 100644 --- a/utils/nfsdcltrack/sqlite.c +++ b/utils/nfsdcltrack/sqlite.c @@ -357,7 +357,7 @@ sqlite_prepare_dbh(const char *topdir) return ret; out_close: - sqlite3_close_v2(dbh); + sqlite3_close(dbh); dbh = NULL; return ret; }