From patchwork Fri Jan 13 12:35:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christoph_B=C3=B6hmwalder?= X-Patchwork-Id: 43277 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp247374wrt; Fri, 13 Jan 2023 04:45:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXvcoHb3HuJuxbbIvshqSBrytgjD/9vneE48Cc2eK0QaTuqUC3OCVtQIivysqK2OP+FC4sQt X-Received: by 2002:a05:6a20:9d93:b0:9d:efbe:2063 with SMTP id mu19-20020a056a209d9300b0009defbe2063mr13444050pzb.25.1673613928151; Fri, 13 Jan 2023 04:45:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673613928; cv=none; d=google.com; s=arc-20160816; b=ROHSr6KLHLetbMv+3LliAvS/RhAhnrdS5TXr5DTP84ROpKJ2ECuRixXlHzrZOvMQfJ DbhQxBju4EVRbSeWDq1+Z315NWTryA0ouLqa4g6PCAGgxfJbhw4ra7/RgoBvEhxB05jB sWUkxCkC8tPOuQmQbFuXgrLjY3adB1d9BLC/7DyDRfDLkggW0qAjuu2umevb21oSDPuH Lggfqk6xAmseFFEiBgif525uVwQsqq32lj5bpTOVrHCOURxXdtyQjB2+GW46jrjb37hp /oK/NZoJIis4R1WGVlqXid+qZqjC7oeEug5n4BBsljPqd2ilojWSoM/HcOwcIdkpV9ef vBXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=w8mQ1DNdko28cUxvjVBwoXrO008ZDGIG0DMI/J1nWT4=; b=RXWaY40PblZkKK8fTJTa/Sw6EAWhXoHNtvDP9Op+5UTARk0TJgiMvQvdGi4FQBmtyP 8qFqit+0CJULQygvsmrwmYCH9rzLlxmIzEypaAukkzqhqQL5FhCHOyQo3IDYdY4Qj4bV zX8vx3f++v0inxCO0mOlIgqO2tI/iWchFkknd25duBAHOyIba5ZGxm5HDrOUXHxD95No 3VZ9fQRZlskIr4wvz4DhSEFNnbHPlzLB3v6lgQ6Vdg2GFMYKZE97dkuBCGZULRJ0n11n T2yfucqPi5jlOXAP3mvyyQnaCUgnoA1vNrASEHlZ0yBmTGwHpT/R8cfF8ogX/BsldQnJ SONw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=spZ9bBE7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f129-20020a636a87000000b00477c8923f79si21108843pgc.449.2023.01.13.04.45.15; Fri, 13 Jan 2023 04:45:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=spZ9bBE7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241783AbjAMMnf (ORCPT + 99 others); Fri, 13 Jan 2023 07:43:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241566AbjAMMnG (ORCPT ); Fri, 13 Jan 2023 07:43:06 -0500 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5699887F39 for ; Fri, 13 Jan 2023 04:35:48 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id u19so51946444ejm.8 for ; Fri, 13 Jan 2023 04:35:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w8mQ1DNdko28cUxvjVBwoXrO008ZDGIG0DMI/J1nWT4=; b=spZ9bBE74IdXZvFGyhmamqe/1SDBwGLUSQcAXBhiwbLOeW5LdETOuSw5m+TSnCduvh i1dq8pBx80HiBAQcGyxEY7bGUwTu7HGxSxh5IVd2vJJzbwTudnAkAOm1FZMZACIgnAUG LJFOsRpwpphyUe8m9LlCxV+VWqB3hnbrDjtKvi8zr4L8jJ7bq1yM+6S8hSkauyzAELBb h8cwpFX/WD9jR0CJed2lXICxX6+pQu+9OhUREJogH4PvwJZEDLXjcm1ihM0rQwzO7Ya5 859r3Uyiovs6+qkiWv/7Wy163pJ4VOkBZlrkbGWRu9MdVP8K0Q7Rt7so9rV00GVCbZko T0/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w8mQ1DNdko28cUxvjVBwoXrO008ZDGIG0DMI/J1nWT4=; b=i0jvVSd2/fC66Ej97A+EUsDcDGMSknRJ4ik1Ws8uA1DVdDRyRhES0nhp6kByCmS6aT +9RCw7TZAnIhbsS3fS5LnzlM8tV7KVpDo+e0GUcNNrz7/LQBGqlzNBcFVhdVkhGlImhs fKotX/mKVqdzsBWye4u4dMwY15N5QMlIu7hGxYv6SYBk2poVq9xLBsVUaEajB3YjILlO CeP5bNGB7Lv+FiewCqEP2Tjo3LwB0a0V5XynCYa77VgJtWFPiNH09emLRv+LnDTQgAai oD8+9IyZCkXEgvrtdl326phEzpEc8L9PLZSZ1SU2JQfx8vmYE99rdqlhQ9yA5R4JDZ9V B86A== X-Gm-Message-State: AFqh2kqcQyIZERIYQEmOOacv038dOeJD0pbgl8fKquWZzdYC0xswfxKL vX3Hke4lC0dOFCOkabJnPIixC+umht8+jPq+PPE= X-Received: by 2002:a17:907:7f22:b0:869:c5a4:e1a7 with SMTP id qf34-20020a1709077f2200b00869c5a4e1a7mr4493526ejc.62.1673613319454; Fri, 13 Jan 2023 04:35:19 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id 18-20020a170906201200b00846734faa9asm8386323ejo.164.2023.01.13.04.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 04:35:19 -0800 (PST) From: =?utf-8?q?Christoph_B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, =?utf-8?q?Christoph_B=C3=B6hmwalder?= , Joel Colledge Subject: [PATCH 1/3] drbd: split off drbd_buildtag into separate file Date: Fri, 13 Jan 2023 13:35:04 +0100 Message-Id: <20230113123506.144082-2-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230113123506.144082-1-christoph.boehmwalder@linbit.com> References: <20230113123506.144082-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754911398238673622?= X-GMAIL-MSGID: =?utf-8?q?1754911398238673622?= To be more similar to what we do in the out-of-tree module and ease the upstreaming process. Signed-off-by: Christoph Böhmwalder Reviewed-by: Joel Colledge --- drivers/block/drbd/Makefile | 2 +- drivers/block/drbd/drbd_buildtag.c | 22 ++++++++++++++++++++++ drivers/block/drbd/drbd_main.c | 18 ------------------ 3 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 drivers/block/drbd/drbd_buildtag.c diff --git a/drivers/block/drbd/Makefile b/drivers/block/drbd/Makefile index c93e462130ff..67a8b352a1d5 100644 --- a/drivers/block/drbd/Makefile +++ b/drivers/block/drbd/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -drbd-y := drbd_bitmap.o drbd_proc.o +drbd-y := drbd_buildtag.o drbd_bitmap.o drbd_proc.o drbd-y += drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o drbd-y += drbd_main.o drbd_strings.o drbd_nl.o drbd-y += drbd_interval.o drbd_state.o diff --git a/drivers/block/drbd/drbd_buildtag.c b/drivers/block/drbd/drbd_buildtag.c new file mode 100644 index 000000000000..956a4d5c339b --- /dev/null +++ b/drivers/block/drbd/drbd_buildtag.c @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include + +const char *drbd_buildtag(void) +{ + /* DRBD built from external sources has here a reference to the + * git hash of the source code. + */ + + static char buildtag[38] = "\0uilt-in"; + + if (buildtag[0] == 0) { +#ifdef MODULE + sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion); +#else + buildtag[0] = 'b'; +#endif + } + + return buildtag; +} diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 7213ffd69a16..345bfac441da 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -3776,24 +3776,6 @@ _drbd_insert_fault(struct drbd_device *device, unsigned int type) } #endif -const char *drbd_buildtag(void) -{ - /* DRBD built from external sources has here a reference to the - git hash of the source code. */ - - static char buildtag[38] = "\0uilt-in"; - - if (buildtag[0] == 0) { -#ifdef MODULE - sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion); -#else - buildtag[0] = 'b'; -#endif - } - - return buildtag; -} - module_init(drbd_init) module_exit(drbd_cleanup) From patchwork Fri Jan 13 12:35:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christoph_B=C3=B6hmwalder?= X-Patchwork-Id: 43278 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp247393wrt; Fri, 13 Jan 2023 04:45:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXsDujwpnUVqqFMVlw5DjINA5uRpHrHrwlsI9jZmGFAydtxzMhENCpmnEIGK+SohZ+WtthGN X-Received: by 2002:a17:902:9b8f:b0:192:6d68:158 with SMTP id y15-20020a1709029b8f00b001926d680158mr75336407plp.15.1673613930513; Fri, 13 Jan 2023 04:45:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673613930; cv=none; d=google.com; s=arc-20160816; b=QHoF1+9v0h6H/C5nzpMojGbTMe3MeXtlNO82BiXa3McRPXjljOfDVgugwX+Qa8yxtP f7+Tm2xTjn92LmS5IKClMS1RcEfFF56RTRfk3OVCjbeIQr0Rg7THBiI5lUUvg/mWJrux MYyW20RKdyfp+Ecmq1elLxb6rQp3tKP2yFp+te9MZLyfZQUdc2SNMjA83BkVWhoisXK1 JTY5CB8/dx6sSj/1Elz9T68bH6E+LwH/VnSIsk4C3EuAr7Ak/ea+GVQVODf8kT5GCK3E GU740Lv2GQWqJ7AtwMoMT11ihzGpQa8WLWBWMNf6RXjkWJVr1J+kfSW7NYzk9uQfv25c RNdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rnWGghdREJ6zIaEe7+G9hDEkG3lKlZcJtoyqEzGOui4=; b=geBPBiTdDZ/xMgV06UvMmJWpzC62f7LZl74puzqFO8A0ckVd4c/Towj8/3G8GFH7AW bWjaDCUCR718GidbEQCF7digUW5BZEPdfFGJ+E1quALcTS1FFoAQW3vCxguQUmzdY6+L ht+AJzKn+kRWSC05E/9Q9ufQTMhhZB0Ig8VrVV3YpQLi+e2VPkjevPVTd08hPvJ71Y21 Jw7wDfL2VeDXYf8Nxqcf+NmvJuCq/Fg1UruwjQNB6wy8XVcVYjlxy11B8s6tuJtWQ1Pq 9RJQWJPABgdMAm1ZICqTOpo6Xb1ZO35/lKqsr+z0fKVPdwr2Gs5AgFh5G60LEpkxfr0s rNJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=7MggSvVJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x1-20020a170902ec8100b00189c4a9c5ecsi22264704plg.297.2023.01.13.04.45.18; Fri, 13 Jan 2023 04:45:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=7MggSvVJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241604AbjAMMpF (ORCPT + 99 others); Fri, 13 Jan 2023 07:45:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241761AbjAMMnH (ORCPT ); Fri, 13 Jan 2023 07:43:07 -0500 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F41287F31 for ; Fri, 13 Jan 2023 04:35:50 -0800 (PST) Received: by mail-ej1-x62f.google.com with SMTP id mp20so5393489ejc.7 for ; Fri, 13 Jan 2023 04:35:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rnWGghdREJ6zIaEe7+G9hDEkG3lKlZcJtoyqEzGOui4=; b=7MggSvVJcvB+UhgdCA3YbS9r+ZOV3AkBaHplJBS3GHTsZ7kKYp6j6tXdu3rHlUqUXg CuAfampyUgvOK/Fjbv+qH5HZtB1stqe6g5zwpCnI2n1nXZ9V5LzZPISGD/8Rks0pJVd8 3hOsc+AUF1w1Cgt6rac331YMACuqJ5zZDkJHuMd0X0+JgPBKuzSAYJu9TkR3TizU1AJ/ phVvbDXyDj0AFqcLRk4ActDz2MfJpRpdnlUm2cpG6EFRJfyMePbRmfm7qZv/7xQCYsUL VtmfkqA8ATSi4pBSUl7CMjgtFQKfrHylppisWyml8jf0ra9PKm1lR0Akk9lI/b3A5BJK grHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rnWGghdREJ6zIaEe7+G9hDEkG3lKlZcJtoyqEzGOui4=; b=yu2yEfeMakIyYs+egWkCVwHSpXT055Ond6wt2n8Opf0gcGHBojxu0WsWDXnogYaiXq UxBTwM3S9p8uOnVDTcy8ruI4NlW8CAHxJUHcjmLyZWvOAGfSRaSDLKUq7UegqyyptphQ yoSzl6eTXpCJZ5t4Oe2l7T2A6yjqPZhVIIFAT/v9p5v17ryq+em9WCrQAT6b7Zm39ivz KBBEpG85L84A5htXEXRhkBkHMCsnFAD6+uD0UMhkEGrdpnxpzXHyBOKX9tB+DgbRqJ5b 5FiOLIDTGYTdJ8isFLT9Zpt0+LseC7AGZ5EsZuVhITFCol+0OHXwT+S3mAk+W0NbG5Mf ce/g== X-Gm-Message-State: AFqh2kqT7+SgVA2Gs29eYuxnKlKZ23zGqss3fIxs7Q36i/AnEGztDV0Z K2Q9r+eVUHin3V+H+hOBFwGZFw== X-Received: by 2002:a17:907:d50d:b0:801:d6f2:754 with SMTP id wb13-20020a170907d50d00b00801d6f20754mr70167151ejc.52.1673613320223; Fri, 13 Jan 2023 04:35:20 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id 18-20020a170906201200b00846734faa9asm8386323ejo.164.2023.01.13.04.35.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 04:35:19 -0800 (PST) From: =?utf-8?q?Christoph_B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, =?utf-8?q?Christoph_B=C3=B6hmwalder?= , Joel Colledge Subject: [PATCH 2/3] drbd: drop API_VERSION define Date: Fri, 13 Jan 2023 13:35:05 +0100 Message-Id: <20230113123506.144082-3-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230113123506.144082-1-christoph.boehmwalder@linbit.com> References: <20230113123506.144082-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754911400579518500?= X-GMAIL-MSGID: =?utf-8?q?1754911400579518500?= Use the genetlink api version as defined in drbd_genl_api.h. Signed-off-by: Christoph Böhmwalder Reviewed-by: Joel Colledge --- drivers/block/drbd/drbd_debugfs.c | 2 +- drivers/block/drbd/drbd_main.c | 2 +- drivers/block/drbd/drbd_proc.c | 2 +- include/linux/drbd.h | 1 - include/linux/drbd_genl_api.h | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/block/drbd/drbd_debugfs.c b/drivers/block/drbd/drbd_debugfs.c index a72c096aa5b1..12460b584bcb 100644 --- a/drivers/block/drbd/drbd_debugfs.c +++ b/drivers/block/drbd/drbd_debugfs.c @@ -844,7 +844,7 @@ static int drbd_version_show(struct seq_file *m, void *ignored) { seq_printf(m, "# %s\n", drbd_buildtag()); seq_printf(m, "VERSION=%s\n", REL_VERSION); - seq_printf(m, "API_VERSION=%u\n", API_VERSION); + seq_printf(m, "API_VERSION=%u\n", GENL_MAGIC_VERSION); seq_printf(m, "PRO_VERSION_MIN=%u\n", PRO_VERSION_MIN); seq_printf(m, "PRO_VERSION_MAX=%u\n", PRO_VERSION_MAX); return 0; diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 345bfac441da..5156d2fb2d76 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2899,7 +2899,7 @@ static int __init drbd_init(void) pr_info("initialized. " "Version: " REL_VERSION " (api:%d/proto:%d-%d)\n", - API_VERSION, PRO_VERSION_MIN, PRO_VERSION_MAX); + GENL_MAGIC_VERSION, PRO_VERSION_MIN, PRO_VERSION_MAX); pr_info("%s\n", drbd_buildtag()); pr_info("registered as block device major %d\n", DRBD_MAJOR); return 0; /* Success! */ diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c index 2227fb0db1ce..1d0feafceadc 100644 --- a/drivers/block/drbd/drbd_proc.c +++ b/drivers/block/drbd/drbd_proc.c @@ -228,7 +228,7 @@ int drbd_seq_show(struct seq_file *seq, void *v) }; seq_printf(seq, "version: " REL_VERSION " (api:%d/proto:%d-%d)\n%s\n", - API_VERSION, PRO_VERSION_MIN, PRO_VERSION_MAX, drbd_buildtag()); + GENL_MAGIC_VERSION, PRO_VERSION_MIN, PRO_VERSION_MAX, drbd_buildtag()); /* cs .. connection state diff --git a/include/linux/drbd.h b/include/linux/drbd.h index 5755537b51b1..df65a8f5228a 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h @@ -40,7 +40,6 @@ extern const char *drbd_buildtag(void); #define REL_VERSION "8.4.11" -#define API_VERSION 1 #define PRO_VERSION_MIN 86 #define PRO_VERSION_MAX 101 diff --git a/include/linux/drbd_genl_api.h b/include/linux/drbd_genl_api.h index bd62efc29002..70682c058027 100644 --- a/include/linux/drbd_genl_api.h +++ b/include/linux/drbd_genl_api.h @@ -47,7 +47,7 @@ enum drbd_state_info_bcast_reason { #undef linux #include -#define GENL_MAGIC_VERSION API_VERSION +#define GENL_MAGIC_VERSION 1 #define GENL_MAGIC_FAMILY drbd #define GENL_MAGIC_FAMILY_HDRSZ sizeof(struct drbd_genlmsghdr) #define GENL_MAGIC_INCLUDE_FILE From patchwork Fri Jan 13 12:35:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christoph_B=C3=B6hmwalder?= X-Patchwork-Id: 43289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp252995wrt; Fri, 13 Jan 2023 04:59:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXsAbAxYgNGSrrb6ZJs8sAkRZ6KCT6kn5LLAKbnlTsTDvVYltjzST61I/mN43xj4aC9jIbb6 X-Received: by 2002:aa7:8d58:0:b0:588:9c15:65c4 with SMTP id s24-20020aa78d58000000b005889c1565c4mr10095038pfe.3.1673614748999; Fri, 13 Jan 2023 04:59:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673614748; cv=none; d=google.com; s=arc-20160816; b=BIJmatj2qM/lSRWJQp9kGC4m3xwlOUUUzusS/a0OyqkYED+wOQ8ZSwH0q2t6DLt+eD /FjQD14W7hG9k23ggW/8TZ9NfPyBYt4AuY1I5qBCI6IWojiG67ugn8JcdeICzMT9kVEE 5zDYRkTtApWk0siXw6WVLaXytA0KNkiPmB1Ze+sguwJhK+htiSPvkYsUH8UIt/BdtYvD IqNt4WDFK3yIS+2WcUVG5T8wiemmkCN7pmYDdGNPuqSJRBxyXCK57agvhx2ZN4L1ahwi 4I78ZB7O8u3P0lgFDKnY+LEu5uIkGFBuQ4Xi1JOD6VWMT0BEhjyUaKeBCvCyJWDM6xCY H9EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Nr0DjBH1YEnasxrYesj7cvRVZfRH4rPEDs0TxXAHiSg=; b=Ruf0tnpKHayKn59OnzpEMhfYae80JtGKA1GwdDjbRni9wX2oCDK1peFfPXDmpjvuYZ mmbW3+tf+Xr0GFp0hA5XAKqhUd/Igp4cRV1uDa8tTfVLDmDw628rGFHEzbuQPx7HVgEf XQduWgIjKc0K7U1qXpMn2rk2cSTNZ35hasnsq30JNL4TY2gpd+4oiRsNErfY1OS4oCmq Ba4V8JViyOa5prU2oIolEI+lnNfv5AB/Sjme/z2eF1Of7+J1uUGte62zk8KbgZ0nhjzZ k5DQ6e8CtRpsHp2N61kRahD2O/OwnP1VAqu1qcCu1GyhBa4HVMgEm0QNrDucMx6NeLbg jvlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=kE3Rfzlx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cd16-20020a056a00421000b005832ed9e605si19702317pfb.123.2023.01.13.04.58.55; Fri, 13 Jan 2023 04:59:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=kE3Rfzlx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241824AbjAMMqb (ORCPT + 99 others); Fri, 13 Jan 2023 07:46:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241766AbjAMMnK (ORCPT ); Fri, 13 Jan 2023 07:43:10 -0500 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3066887F2A for ; Fri, 13 Jan 2023 04:35:51 -0800 (PST) Received: by mail-ej1-x632.google.com with SMTP id ud5so52040476ejc.4 for ; Fri, 13 Jan 2023 04:35:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nr0DjBH1YEnasxrYesj7cvRVZfRH4rPEDs0TxXAHiSg=; b=kE3RfzlxtjPHuvjfFEhPWJMp54HpFpp1Vnho1/xXHfQgsziEBG2QO7MlogQAjNMV6k xJ+4oX/N3D5Y8RJztAPXEw+2kW+MOz2hCSCzzaxdYommNiVXrq3II4WsgJ+eoa+sbrWY zAv+tdure6XvQ6edN3+fg+QR3xaWJ7OkfBOK2xMCclcTpwFGHgdr+2l1ZyXOC05ZRbHL SSruhU9xk84XGBTJ9QrwziONSZ2puhBmY3SeolCq9KrNeDVnmMAaUnsjArptv7QfH05F HjUDn1+r5B30e9+xtqAOsU/zJh0hjlpmLgky0g0X2xSxcbIKwaoVTY3rFzf8LDLJXfDV qB6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nr0DjBH1YEnasxrYesj7cvRVZfRH4rPEDs0TxXAHiSg=; b=rXwQDfWgDLfcnoRDsnM/xelZwcFCxhCBIaEVBzoMp9Uo0pEm87wvWfRzSmCVpnGMPq wd0LuP45eLyKtPnbWbtQuF5j2ht45DClHtUCwrn/pVRppsiUEj+FlHr2G7U7dON07KCM hKvT3luvlyLs6mpc0KaWwBJqqIb+XR/zr8tre3QxwTavSjFqceEFFiCfYA86mprANqcO gqKyxKzx7e5l+/ydrE9CpVM9UxGAo3JpY756wcj+ZvvoFTXythYm2CPEi1lJF25UY+mV DoczmxYMucGLmHgyxJ8yYl6F5xZ1YvseFx3NXj1sRMdd8/TLxNnl1U1PqGLU+s9YuaI9 5O6A== X-Gm-Message-State: AFqh2kp+hDKzaJY4vMBzcDR7GV54EhLj+NrE8MylB7YrU4+zumBVDVCP 2DvQrqRohFgT89wgCvQ3gK5mKg== X-Received: by 2002:a17:906:494b:b0:862:e612:effe with SMTP id f11-20020a170906494b00b00862e612effemr8182025ejt.14.1673613321216; Fri, 13 Jan 2023 04:35:21 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id 18-20020a170906201200b00846734faa9asm8386323ejo.164.2023.01.13.04.35.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 04:35:20 -0800 (PST) From: =?utf-8?q?Christoph_B=C3=B6hmwalder?= To: Jens Axboe Cc: drbd-dev@lists.linbit.com, linux-kernel@vger.kernel.org, Lars Ellenberg , Philipp Reisner , linux-block@vger.kernel.org, =?utf-8?q?Christoph_B=C3=B6hmwalder?= , Joel Colledge Subject: [PATCH 3/3] drbd: split off drbd_config into separate file Date: Fri, 13 Jan 2023 13:35:06 +0100 Message-Id: <20230113123506.144082-4-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230113123506.144082-1-christoph.boehmwalder@linbit.com> References: <20230113123506.144082-1-christoph.boehmwalder@linbit.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754912259097719903?= X-GMAIL-MSGID: =?utf-8?q?1754912259097719903?= To be more similar to what we do in the out-of-tree module and ease the upstreaming process. Signed-off-by: Christoph Böhmwalder Reviewed-by: Joel Colledge --- drivers/block/drbd/drbd_buildtag.c | 2 +- drivers/block/drbd/drbd_int.h | 1 + include/linux/drbd.h | 6 ------ include/linux/drbd_config.h | 16 ++++++++++++++++ 4 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 include/linux/drbd_config.h diff --git a/drivers/block/drbd/drbd_buildtag.c b/drivers/block/drbd/drbd_buildtag.c index 956a4d5c339b..cb1aa66d7d5d 100644 --- a/drivers/block/drbd/drbd_buildtag.c +++ b/drivers/block/drbd/drbd_buildtag.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -#include +#include #include const char *drbd_buildtag(void) diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index edce1f7ac2da..d89b7d03d4c8 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -34,6 +34,7 @@ #include #include #include +#include #include "drbd_strings.h" #include "drbd_state.h" #include "drbd_protocol.h" diff --git a/include/linux/drbd.h b/include/linux/drbd.h index df65a8f5228a..5468a2399d48 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h @@ -38,12 +38,6 @@ #endif -extern const char *drbd_buildtag(void); -#define REL_VERSION "8.4.11" -#define PRO_VERSION_MIN 86 -#define PRO_VERSION_MAX 101 - - enum drbd_io_error_p { EP_PASS_ON, /* FIXME should the better be named "Ignore"? */ EP_CALL_HELPER, diff --git a/include/linux/drbd_config.h b/include/linux/drbd_config.h new file mode 100644 index 000000000000..d215365c6bb1 --- /dev/null +++ b/include/linux/drbd_config.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * drbd_config.h + * DRBD's compile time configuration. + */ + +#ifndef DRBD_CONFIG_H +#define DRBD_CONFIG_H + +extern const char *drbd_buildtag(void); + +#define REL_VERSION "8.4.11" +#define PRO_VERSION_MIN 86 +#define PRO_VERSION_MAX 101 + +#endif