From patchwork Fri Dec 9 14:55:02 2022 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: 31800 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp823812wrr; Fri, 9 Dec 2022 07:00:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf6e6avJWiqHn/lFxDOhBqcCNMJwFsEpYaJPxdTWijg4o6y8bZD4bicXgxNwEN8z8Igw7xhZ X-Received: by 2002:a17:902:6a85:b0:185:441e:2dda with SMTP id n5-20020a1709026a8500b00185441e2ddamr6916872plk.44.1670598016591; Fri, 09 Dec 2022 07:00:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670598016; cv=none; d=google.com; s=arc-20160816; b=JssmqcxnpIsM28OhXWwnjA9uG4Y9DzcbPJTxQg8hjympXAcNvCkNQmhTWYdqrxjNsn LyJDDnTwrxfa0HPBgazDxxfWOhyX7lg5E50Fpalj/jTKcidIW4IrNMwHCJi/PmBQeo5C e9aWGaBUK7ALm5HEXTFeBbDhyynFsRzbaT6tnhwQgeCcg3dwoiVa2qTiTcf8IhE2fU04 4fXNT0jvr34sEZfzE5xJznRGe95T8cHjAbnWfBpIw8ahwo/OzxG+k6JBwZrol3qhb/Dr 2vmqAkW6FtaikxJwzvjwmQGlE/IW40A/ltzxr9P/ceNMiD5wIpZy/J0DHtKmcqXgJu/Q oqAg== 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=ilNI6aDv8/GkiCIo8TpPvrmUOtcKTf4XAGadT0zybSWtchiziYmDi5Plql5seVqp6T i4elS+TlpmvOOM2V2rti4EBEDhi2m3G6T8Rb4wBCT2aPQdHsuKDby94jnnzlOQ/fUXgN zRgt1gI6x19bhyJieaKZm4dq8a5Z2yKnbU+g9x2Cvo16oicYWEGgtrYLPUX+/7U9TdNu sso00f/mcoUpF0lXxXkFSP73Av+u3Clmi4O3L52E27SMkIJj7kRZMQ0ONXDOKN6P/BoF SW+cbVx9kvUWsGgscsPwlrwFib5JAFL+HvLktFthlob6874X86+hOCb/giuFfYvUjz4G oYJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=IUG8ldHf; 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 i19-20020a17090320d300b00176b26d519dsi1604920plb.350.2022.12.09.06.59.52; Fri, 09 Dec 2022 07:00:16 -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=IUG8ldHf; 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 S229530AbiLIO4L (ORCPT + 99 others); Fri, 9 Dec 2022 09:56:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230006AbiLIOzr (ORCPT ); Fri, 9 Dec 2022 09:55:47 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA0F180A31 for ; Fri, 9 Dec 2022 06:55:08 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id s5so3377812edc.12 for ; Fri, 09 Dec 2022 06:55:08 -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=IUG8ldHfU+Z2W8ssHSjmCqhbct2jByJci7FEf/55pMFshhMS7k+iLD4zTUZM/vN8Vq TRnxOna/m/DOf9FkM5W0nfGKVh437qsWJLBuTc1L9bEkkydiEQacgT3gsZcjlU0QvrUW ghoZGKHys0XNatcxeqS4WGCrc+i44BYjUktBdRGNt5HDu0QUK2jzN5dxUu9Pae4kYw7h BowqGf+a/9DnKfnfzwmGO2yrWIzTzyjRegbyqqcoPtXBIoLHqO/5TnYN+Tq+dbTaDC69 nCbN+jY+30BuRxWcHwRaAY0XSsCekS76GhnIPJBGTsy2XQy3ak0QU/x27zXWOJnP7sHb jgNw== 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=T0AVvfwCF7Ro6O6YqwF7ULE8+FaGsJKpLRrjBSkvO6E0D+NoGDk3w7ZTGFOh+Mnwtz xk9XFN6jHSEPi9iTTR/OEegwg5NZ+v24uHkXmb9UDRIaAiERNZuWg6seoZn+cXwnWSaJ XfS26b7pH95e7lg4DOaA05IvnGrgKpw9tbkliLzleu6GM7r7Cxi0Q4mwZ8Vureopd4mD XtKFdn6B6brJCPZCHHIspPNQ+pz74V1ehq4nK2XC+wQU56m3EKRENjapy0dSWltvTexR n0K7dLbV3Oq/8lYO4+4iPHfe/Is/2YeKEJtsTTU+mWELIyDN/WZDPj7Zh2LqeNMJ3Q/B bn1A== X-Gm-Message-State: ANoB5pm4AN5NpDebElO7XXic0kUt+r+lQsO9SX751tJKIq2shi5OyjN2 LdlJLCqp/guUqMacMyZXtS2P8g== X-Received: by 2002:a05:6402:500f:b0:461:bce0:c783 with SMTP id p15-20020a056402500f00b00461bce0c783mr7206023eda.36.1670597707421; Fri, 09 Dec 2022 06:55:07 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id l4-20020aa7c304000000b0046b1d63cfc1sm716856edq.88.2022.12.09.06.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Dec 2022 06:55:07 -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, 9 Dec 2022 15:55:02 +0100 Message-Id: <20221209145504.2273072-2-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221209145504.2273072-1-christoph.boehmwalder@linbit.com> References: <20221209145504.2273072-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=unavailable 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?1751748986070072880?= X-GMAIL-MSGID: =?utf-8?q?1751748986070072880?= 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 Dec 9 14:55:03 2022 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: 31801 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp824258wrr; Fri, 9 Dec 2022 07:01:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf57EltX0Xz3GQ1zs0/f6RjNhVsWM6xMn7lQMexazWNLzhC3OxUjRP70j4/5VKHxr+fEh5J4 X-Received: by 2002:a17:902:ab97:b0:189:315f:1d40 with SMTP id f23-20020a170902ab9700b00189315f1d40mr6070059plr.69.1670598059777; Fri, 09 Dec 2022 07:00:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670598059; cv=none; d=google.com; s=arc-20160816; b=JjA1SZuuiwDy+Zh9AmstY+6XrDObcMhd+Rc8wfOuOnEe9S1jAGvVMLQncRNeJspr/h LfPnhEt3f661aWMUHLAIkDNsmccHTcR5krf4auF+tSFbmI3ITAt+u9jLSlNe4jzpBMFj BaQvmsuPIyRn22sWm5yiwM82uJ5bmxL6TsZDiptx+yqa3gx4UpcP+Ytk5TAvLhZM9MBh 0gnjvlRq/Tawg1FQD4FRGS6HY1gyH7KME+iI6UDQn71TprDYs6fvbfbbtoIW9UvwZ0CC YSLFz764ZqloJ/zoW8NEaNi+MDy0MpxHAotodxT+pzQyXGlZqfUYDpeUEyAWbfkUuZv/ hWIg== 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=flmiMf8y0rCgQ0CmhXuCa5oUZCaKJhLfZoGHrIH91Dy50SP7pMawpYNdFjRzTNw5Hg PT0v4RZLoqSYiLeT+zIV7n8OX54RHCyiW7i/oKrCn9fF3fJIZh2SbMwNb8+F7KDhwz68 vE4dEfiIhiAHeinG1kAANXPxBpzhX8UlpbcNXLYTZwkTCXHPa14wpiSjSB5q96LhAhR0 RtYE/U3XYIT3ArM7yWTVmpvNqxoZcpU9uM867lnQV9fy6qtQ4JW6qEmmKw5mTXTG+hZg RIMwllT4lRF9t2rpVb98UtPs3UG76vqhbnZht0tgYaDuNUW6MV7EmmbNNwCsp93UZBrR epxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=etk+O6Px; 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 q9-20020a170902eb8900b001865f8637a8si1708870plg.334.2022.12.09.07.00.36; Fri, 09 Dec 2022 07:00:59 -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=etk+O6Px; 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 S230107AbiLIO4P (ORCPT + 99 others); Fri, 9 Dec 2022 09:56:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230074AbiLIOzr (ORCPT ); Fri, 9 Dec 2022 09:55:47 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BCBF60B64 for ; Fri, 9 Dec 2022 06:55:09 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id e13so3400397edj.7 for ; Fri, 09 Dec 2022 06:55:09 -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=etk+O6PxUdlMnrbUHpn6B7DyLtaQUUWYF68CRq/diHpQhMD1Z8IH20wHDuGOJ7Ps2J vC2i9BWWlwz5l+GrDZNBxw+W1qTuXLQlNfCd7StHomMxa3+hnOJ4iXULEZ1yXuUtLIi7 pZeG2tOWgfCC8jIEQTqshRzeWx3C8PCoXdDZqbRIUx/JuNKnTzg8qDamfb4MhonIB03y uYbkQ2tX8LWjTCRPZpY+AVF1BobG/QCvsVsuV9T2/ra06cxeIpJSHKw0TfYf/Dlkruo+ 8BZwazFbW6b0ntHMmBhjuTA7FwAsGpCBqGzaDNkL890QWEVq298eQneGC4gS/ev6ADSw 4Tvw== 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=WKNGBpWNkaLNgwFTMD19Y/S66TOsfOJCJuxisxJalANG4noDLfN8bplSVZiQuSwyRl JcYOiJ0ooB7L/cPV5eGjEjAouDtB2MVvXWk7ZXFIWBw+KSwsEF/EA25EdrzImKTOnSDN 0ZOR1Ul4Wwa1wxcVxU67qcSAMUBBEKrE9RkXGLreieFZmDZ9YgipHs5kNi/MNuCE+zjr rJF9VPKCruWuG3kbQw1NI8rdagEzzXHDj5R1ZlGzWcSIhr8B8BpUVx2p+ECEGq5U/S6W yiLhKoejbZMskuPHS7QBATvBXc6EZTKzIV2sQuJUaRDwyuisDknwEulWLYVdyDsTkF2S RNlQ== X-Gm-Message-State: ANoB5pk2JlcX5xjWBPqnvcvC/pNySSUaplW8LzvTPACfZ94ZK9k4pvf0 IdvZH2AVp97Np3wAho+qvNDnlg== X-Received: by 2002:a05:6402:298d:b0:465:f6a9:cb7b with SMTP id eq13-20020a056402298d00b00465f6a9cb7bmr4954559edb.12.1670597708142; Fri, 09 Dec 2022 06:55:08 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id l4-20020aa7c304000000b0046b1d63cfc1sm716856edq.88.2022.12.09.06.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Dec 2022 06:55:07 -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, 9 Dec 2022 15:55:03 +0100 Message-Id: <20221209145504.2273072-3-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221209145504.2273072-1-christoph.boehmwalder@linbit.com> References: <20221209145504.2273072-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?1751749030911286586?= X-GMAIL-MSGID: =?utf-8?q?1751749030911286586?= 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 Dec 9 14:55:04 2022 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: 31802 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp825650wrr; Fri, 9 Dec 2022 07:02:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ucFFRPEhCsxI+8avBsIwbxT2iZFNWj5VbRF97dFHpiWSfD1dA3SuQAbOqsisW6mEWWkOH X-Received: by 2002:a05:6a21:6d99:b0:ac:21c3:2fb7 with SMTP id wl25-20020a056a216d9900b000ac21c32fb7mr8528356pzb.6.1670598162423; Fri, 09 Dec 2022 07:02:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670598162; cv=none; d=google.com; s=arc-20160816; b=bkux0OdoGVp05hfj7P4NqPgmJs8Vszv8gZUwb/QfPqITDIHRBwHQZjmEXnhIcx+uB0 RKDJdWA4dflhb1OEg1azUV/994g/hJT1i4LSbOWviEzO3UlpJMa6gxVtxTxXSwAMFI9D Sdaum2ad5S7+UEkDt8WUAf7tZpmWNmOUrsI1+4SiTig92uhR+KTSQ6G5+ulx2MZlv9FA g4lNz4SPDCi+wOTRtw00rcHznCUDB891QnBrOQStOVbZsvCv5aoa3RxyfthVtoYLC3fH 7LP4NyW8yHQhe26OL6hgkbvvYNLWD9eXKPqVo66rJaklh5B3Yps5Zz26LgFd31AqlolL SsIQ== 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=ytF0H6IbIynevNzy+qV4IIGm4V5uOuJ9td7lNQemAhqqUCgSSPSekBkm2hx9m3e22o 2Yf05oIj4JseBkogM8Mz6D1VocHVF1ik3Scxbh00lSu66TAmbQwkejWBC46ZJx+YZQZG c9D7D6gCw4JveIq7WrNIjAkU5PrBm1soCvURW+95oPY60nogLoSUrUUT6WAHiE1WCgGi TJA1P6xvB8PtIlUoSzmLuZo6zQDcOOnIiWlYJLlSb86KawPR4pcE+mlEehJXkvmsW24d 3rWqLMjZrhHKX+b4LzcPi6JFgtKyxwQf3/2BSoTCuHwBvJN8olKzpyX5tJrfoM+sL3hD ZkgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=6BR4ftmE; 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 w70-20020a638249000000b00478775e5cdcsi1669013pgd.418.2022.12.09.07.02.26; Fri, 09 Dec 2022 07:02:42 -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=6BR4ftmE; 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 S230146AbiLIO4U (ORCPT + 99 others); Fri, 9 Dec 2022 09:56:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229656AbiLIOzs (ORCPT ); Fri, 9 Dec 2022 09:55:48 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51B1C80A3F for ; Fri, 9 Dec 2022 06:55:10 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id s5so3377885edc.12 for ; Fri, 09 Dec 2022 06:55:10 -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=6BR4ftmEi4cwaY0Zq2EMADfCq7D3R7dRhGj565BcwcOdftO7DpLqU7m1Uq+/yJ+AGZ jh/kM4TgyggxJ+OTIBjhyKG6SAj9vKbh98eNvUeU43HoQPObiR6Pz9b5QNHJ3vavH2k1 ZtqdFgFQq6/oMk76hY+leei80rWiI5ExUI3F5vd83sJCp4F/ZTicV1hH7KE6ocr2Kxbc vIl+6NtxjPHuGXJE2mutZpRE0s5Mz54VT5WHCKvnLwDfs5udM6eQpLVXxJ2N+nbLSW9f wqeE2ymttBeIpxn5/ahdOSnUceCLnfxZJcAzEMCvBIYv079KyzKGFg/I7JNLpD/SZZ9L d6Cg== 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=fRySLWAL19mVCtX6jY9hGAgciUZ0LPcBb76UJ56u11IZIMA95Y3LqQhUgAHEeG57XB b3Tm45hKRP2+3+3YS5RkQailiwwLkTu8XS2yNGtzY8fPa7lDvTP5jDZoOEXCbQKd7y9P oQ6JRmvnzrNU0cpneM/lPeuZhKqB2lKnCcZdQIQG/hkAqFieEhJ//yfddLlNXzZxQA+u NoKm+uTAT6XI6Jetfllqm4SvQO09f19NRMEEGv4RT9H5+bka1GrkxpFZCnhVood8gYrT 5cOe8tAvE5GmvfCLjIxMXC3N2p+YX4rhjLKk0rnRHdn5AaxC5uAWXIFDIbzzEr6kxURa 5epw== X-Gm-Message-State: ANoB5pnoPp4Egse5MR+W5LKNI+FVz94DuoxMSIYWNpadfpO/7PjKY6L8 vOaZzHsZ9jPmJl0xhOOlfhnHcg== X-Received: by 2002:a05:6402:1004:b0:46b:c156:9965 with SMTP id c4-20020a056402100400b0046bc1569965mr5266982edu.38.1670597708861; Fri, 09 Dec 2022 06:55:08 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id l4-20020aa7c304000000b0046b1d63cfc1sm716856edq.88.2022.12.09.06.55.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Dec 2022 06:55:08 -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, 9 Dec 2022 15:55:04 +0100 Message-Id: <20221209145504.2273072-4-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221209145504.2273072-1-christoph.boehmwalder@linbit.com> References: <20221209145504.2273072-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?1751749138259594790?= X-GMAIL-MSGID: =?utf-8?q?1751749138259594790?= 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