From patchwork Sun Oct 9 13:29:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugene Syromyatnikov X-Patchwork-Id: 9369121 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A4F7F60487 for ; Mon, 10 Oct 2016 08:33:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97C6129325 for ; Mon, 10 Oct 2016 08:33:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CCB92933B; Mon, 10 Oct 2016 08:33:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 48DB629325 for ; Mon, 10 Oct 2016 08:33:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9A8Ui6K053199; Mon, 10 Oct 2016 04:30:44 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u99DTr7L016580 for ; Sun, 9 Oct 2016 09:29:53 -0400 Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u99DTrtG004765 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 9 Oct 2016 09:29:53 -0400 Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A5A404E4C0; Sun, 9 Oct 2016 13:29:52 +0000 (UTC) Received: by mail-lf0-f67.google.com with SMTP id x79so2026060lff.2; Sun, 09 Oct 2016 06:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=R/fm/3PJvn/6LIzZ3FVYSpdJQQpg6yNyaocKnX3zvcQ=; b=Oq6R5j2dpI2XM/61gxIDx/5Z1dGLCk8+h/E6riFa7tvDzbXpTT5NtRt6vU0gxWAWhV N4NNrKXmRREbcQiUsVfm+3ucuwJKJzJIA9QN5zv6lFU+jNoAEEGg8qNivf1LJkS8fZQL xaTzZ1vGxySZND3EH9HU9yQakuJGDb4lNxgJMTHhIu7JX6jhCBpSo4Lc3stW2dkoSh62 7SSYznoTBIDQme1ZZXu+dszP/ytYCuIWwp3DqVF4ha1Cf4LDFNFqQMnau0ySFMJWWeWz eaY1QMQqgm/glnlsvZvIXSWQRuC4+4oidYJ8rDE8o/5GulUAbjoF6IapHqMWv0z/KcSx I89A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=R/fm/3PJvn/6LIzZ3FVYSpdJQQpg6yNyaocKnX3zvcQ=; b=G8EKBOEbm7irXNtiT22+L9qeUjR0AIh/QHhjCTV3JCd0ArR/Hth3RkHc9qfHAxcQt4 grOoj3xv7ITGUlNy59mGYJZpX/XPCnE+fUrRPOyy5Wascr80rf2lLRCS+WWeRMTLSflu CRi84Vka7HSlrBs8f5lnFqU/PvPKN1u46QWXIPJj1YMRIl0XE+HPexVwTM8jX0TA7JW2 SjsYZigQpre4hsqtLeIUMzc8y5ppqVgYczmsG3uKVIr2yTcIT63x171RMkBaDFiji5Zo 5fMm0VpSEXs8VUGq8o/PXpHf7p43X9Ubeurd3zQoVUncQOc7RUJiPyGSK7IyhJlke/32 qX6Q== X-Gm-Message-State: AA6/9Rn8+0P30fuqM7S4Vo5qo5Bkj0nJi/zFtlFm2AypnQFGKN0PMhEOOeGatv4pfV2Y1A== X-Received: by 10.46.71.18 with SMTP id u18mr10916911lja.23.1476019791051; Sun, 09 Oct 2016 06:29:51 -0700 (PDT) Received: from obsidian (broadband-46-188-15-144.2com.net. [46.188.15.144]) by smtp.gmail.com with ESMTPSA id u131sm5050010lja.23.2016.10.09.06.29.50 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sun, 09 Oct 2016 06:29:50 -0700 (PDT) Date: Sun, 9 Oct 2016 16:29:48 +0300 From: Eugene Syromyatnikov To: strace-devel@lists.sourceforge.net Message-ID: <20161009132948.GA2910@obsidian> References: <20161005.192828.566127461630656590.yamato@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161005.192828.566127461630656590.yamato@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sun, 09 Oct 2016 13:29:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sun, 09 Oct 2016 13:29:52 +0000 (UTC) for IP:'209.85.215.67' DOMAIN:'mail-lf0-f67.google.com' HELO:'mail-lf0-f67.google.com' FROM:'evgsyr@gmail.com' RCPT:'' X-RedHat-Spam-Score: 1.17 * (BAYES_50, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, SPF_PASS) 209.85.215.67 mail-lf0-f67.google.com 209.85.215.67 mail-lf0-f67.google.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 X-loop: dm-devel@redhat.com X-Mailman-Approved-At: Mon, 10 Oct 2016 04:29:54 -0400 Cc: dm-devel@redhat.com, mpatocka@redhat.com, yamato@redhat.com Subject: [dm-devel] [PATCH 06/21] dm: Some future-proofing by means of compile-time DM_VERSION_MAJOR check X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP * dm.c: Add check whether DM_VERSION_MAJOR equals to 4, provide empty dm_ioctl if check fails. --- dm.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dm.c b/dm.c index ebdfc44..79bb7c7 100644 --- a/dm.c +++ b/dm.c @@ -5,6 +5,8 @@ # include # include +# if DM_VERSION_MAJOR == 4 + static void dm_decode_device(const unsigned int code, const struct dm_ioctl *ioc) { @@ -375,4 +377,13 @@ dm_ioctl(struct tcb *tcp, const unsigned int code, long arg) } } -#endif +# else /* !(DM_VERSION_MAJOR == 4) */ + +int +dm_ioctl(struct tcb *tcp, const unsigned int code, long arg) +{ + return 0; +} + +# endif /* DM_VERSION_MAJOR == 4 */ +#endif /* HAVE_LINUX_DM_IOCTL_H */