From patchwork Wed Aug 27 17:46:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 4790291 Return-Path: X-Original-To: patchwork-linux-btrfs@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 1C7A3C0338 for ; Wed, 27 Aug 2014 17:46:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EAF652012D for ; Wed, 27 Aug 2014 17:46:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FA8D20127 for ; Wed, 27 Aug 2014 17:46:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933849AbaH0Rqg (ORCPT ); Wed, 27 Aug 2014 13:46:36 -0400 Received: from cantor2.suse.de ([195.135.220.15]:40962 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750908AbaH0Rqf (ORCPT ); Wed, 27 Aug 2014 13:46:35 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BFFB5AD85 for ; Wed, 27 Aug 2014 17:46:33 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 4103EDAB0A; Wed, 27 Aug 2014 19:46:33 +0200 (CEST) From: David Sterba To: linux-btrfs@vger.kernel.org Cc: Arvin Schnell , David Sterba Subject: [PATCH] btrfs-progs: library version defines Date: Wed, 27 Aug 2014 19:46:32 +0200 Message-Id: <1409161592-27875-1-git-send-email-dsterba@suse.cz> X-Mailer: git-send-email 1.9.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Arvin Schnell commit 46de1a6ec3dbb0db203baa6c46cb64ba9b000ea2 changed the parameters of btrfs_read_and_process_send_stream(). This breaks snapper compilation. We can include version defines usable for the C preprocessor. Version 0.1.0: API up to and including 46de1a6ec3dbb0db2 (3.14.x) Version 0.1.1: 909131939f750faffb9fab (changed in 3.16) Signed-off-by: Arvin Schnell Signed-off-by: David Sterba --- Makefile | 2 +- send-stream.h | 5 +++++ version.sh | 17 ++++++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e721e99c8319..73ef386896bf 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \ uuid-tree.o utils-lib.o libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \ crc32c.h list.h kerncompat.h radix-tree.h extent-cache.h \ - extent_io.h ioctl.h ctree.h btrfsck.h + extent_io.h ioctl.h ctree.h btrfsck.h version.h TESTS = fsck-tests.sh convert-tests.sh INSTALL = install diff --git a/send-stream.h b/send-stream.h index 293bf6af3659..bedff4d0422c 100644 --- a/send-stream.h +++ b/send-stream.h @@ -18,6 +18,11 @@ #ifndef SEND_STREAM_H_ #define SEND_STREAM_H_ +/* + * NOTE: this file is public API, any incompatible change has to update + * library version + */ + #ifdef __cplusplus extern "C" { #endif diff --git a/version.sh b/version.sh index 90000019fe1d..2e4a8d9e1303 100644 --- a/version.sh +++ b/version.sh @@ -8,6 +8,10 @@ v="v3.16" +lib_major=0 +lib_minor=1 +lib_patchlevel=1 + which git &> /dev/null if [ $? == 0 -a -d .git ]; then if head=`git rev-parse --verify HEAD 2>/dev/null`; then @@ -24,8 +28,19 @@ if [ $? == 0 -a -d .git ]; then fi fi -echo "#ifndef __BUILD_VERSION" > .build-version.h +echo "/* NOTE: this file is autogenerated by version.sh, do not edit */" > .build-version.h +echo "#ifndef __BUILD_VERSION" >> .build-version.h +echo >> .build-version.h echo "#define __BUILD_VERSION" >> .build-version.h +echo >> .build-version.h +echo "#define BTRFS_LIB_MAJOR $lib_major" >> .build-version.h +echo "#define BTRFS_LIB_MINOR $lib_minor" >> .build-version.h +echo "#define BTRFS_LIB_PATCHLEVEL $lib_patchlevel" >> .build-version.h +echo >> .build-version.h +echo "#define BTRFS_LIB_VERSION ( BTRFS_LIB_MAJOR * 10000 + \\" >> .build-version.h +echo " BTRFS_LIB_MINOR * 100 + \\" >> .build-version.h +echo " BTRFS_LIB_PATCHLEVEL )" >> .build-version.h +echo >> .build-version.h echo "#define BTRFS_BUILD_VERSION \"Btrfs $v\"" >> .build-version.h echo "#endif" >> .build-version.h