From patchwork Wed Feb 15 16:31:57 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: 5466 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp290433wrn; Wed, 15 Feb 2023 08:35:48 -0800 (PST) X-Google-Smtp-Source: AK7set9ckB+6QT3Ba7Jrql7mVUepezvgUF3N3tBcU+bT/D12dk684v9xDeca9ZiNgPfqj36cr9QM X-Received: by 2002:aa7:d853:0:b0:4ac:bd93:c978 with SMTP id f19-20020aa7d853000000b004acbd93c978mr2426071eds.38.1676478948228; Wed, 15 Feb 2023 08:35:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676478948; cv=none; d=google.com; s=arc-20160816; b=H5SAGnXvyDskSdXUXmnoLLfHsBbZx7FQbL4DDF0Z0vmsNFqs8UuVjHvIbdkluqWMCx 4xq94CKWkBZ+O3UuTK1WWkt82KKg9neZM8+5D1pcPR20lvfpUf7VmkkyVo6nNeUS2ElX BRvWIWQFS34h8zFIl4aDqfJK8QQHsf4fG3+HppLGo+Mzmd8aTkoToQliWe1IbXlHgPO9 09uwRz1LiZVJg/5zcUjXJPh+jpAZa/QblJSneG7XvBrvtQYWqGUh33NT9O2Wqmb1FhjU nNQQWJQy9tQ348hc50bbE+8/WKkHuRIc7whjmdbt001BdlvHqweoVD8Q6s9RLDqaLjbw OOew== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=kVN86nOOyYYar4Mdb1dt7pims1f6cgmu15fTfzFSsDY=; b=BsSkiWyHh5JpPv9W9kBnJrIHkjDshDGPrL2DXM3J4cUghkOmF/yL0LtlOCQxs4INq3 +jKvYxghKtNq5ITCJ5ZQKDfYllG9qiPBQNQjDgBNAuIfKFtOzhN7RbVFx7dNNeCRgNnu jxd3CFn5QeoYvo6xmKHXr98AAYGCnSjAcXNnc2GQRG8YqcVzztLM3swjWcu+XwJ5KGXy 7Cx709H1TvTzVSsP0Hq8uJ4h9rIDdu3PJ5NpEl+6XoMdXYIk47C0qe4TXVoAP/2pJqXY kVfLpQbwqzletFbyN/DcjLOkO9vUG7EBSEJe1+zAQq9PcLOsHF3pLuPgjGTV/n2D6fkP lY3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=vAkMmTWB; 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 l11-20020a056402028b00b004accbc4a5absi9829032edv.110.2023.02.15.08.35.24; Wed, 15 Feb 2023 08:35:48 -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=vAkMmTWB; 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 S229680AbjBOQcQ (ORCPT + 99 others); Wed, 15 Feb 2023 11:32:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229561AbjBOQcL (ORCPT ); Wed, 15 Feb 2023 11:32:11 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3090D3B0DF for ; Wed, 15 Feb 2023 08:32:09 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id k3so12127413wrv.5 for ; Wed, 15 Feb 2023 08:32: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:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kVN86nOOyYYar4Mdb1dt7pims1f6cgmu15fTfzFSsDY=; b=vAkMmTWBai0DK5yuVBZWooHSqXvGdCA6ytAm/9kEV5E3Js1I+xJYb4iBYu5V8MS2HL 0N8rE9RhOXMygf604uy0SC3/eVRIkARlrj6lT8LZWOqsUsHcizRQdc1FoBiU4Xf2JB7j s0jvvU77qqb6+3JAbVjgRn0nNg01J5xX+L06umCgkJWtv3yauSX3LI8Orx2/df3jRdKq yxi2ntvd8tVB9+Lc/2zikP7ZPFMYhxrHAoTEqT7MnGQaJhSHDx3j+MICvbXQQJfuDteJ V/wVabwBSayyi+OCZlsGlfw6m3HFKwHKqUEXcpnrCjUXp1CDw62sSLv6xXtI+YwUIwpd zEBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kVN86nOOyYYar4Mdb1dt7pims1f6cgmu15fTfzFSsDY=; b=l+FzSKw5YEy592Jzu0kRwbIPwbj/RxVopAy1mMfQu05KwUfZ8PAfMaJUkS8P23zqys 3c4ZJaKcpG4GejhGu0tGoffObPXs3b0wUl8TjMLX1lsqb4Q8ofbOh2hYuJKijUktdHK0 gWTaXP3isKGgIiin9Th2Stt9vHme9Zgju6aSiJJRUMJ/T5Cv/WAUyhfQeWiPhexbPUch y34YWuXE8enwN3IPdVpkv8PI+Nyma3UYQtkHWz23qF0WZrNvfqKixGlcmtqp908GWOaW KFMHqe8gh6W9HcRnUs5/v1PIL+NiC79vi/zaPAfkteC6MaoDaMn61EnKRZ/AYWErP/bh Bk5w== X-Gm-Message-State: AO0yUKXIoZ5/8nI2Mnd8XQzsfhIy1E2YJzw2vk+vEzVJKsd5bW0SxARJ /I/EjFBDbnQ+CVV3SwZ6m8hIuA== X-Received: by 2002:a5d:5502:0:b0:2c5:5847:390e with SMTP id b2-20020a5d5502000000b002c55847390emr2002643wrv.68.1676478727666; Wed, 15 Feb 2023 08:32:07 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id n4-20020a5d67c4000000b002c56287bd2csm4865055wrw.114.2023.02.15.08.32.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 08:32: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?= Subject: [PATCH 0/7] Assorted DRBD refactoring Date: Wed, 15 Feb 2023 17:31:57 +0100 Message-Id: <20230215163204.2856631-1-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.39.1 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?1757915589223516815?= X-GMAIL-MSGID: =?utf-8?q?1757915589223516815?= Another set of "backported" DRBD refactoring patches to bring the in-tree version closer to out-of-tree. These are (hopefully) no-ops, pretty much just preparation for future upstreaming work. Andreas Gruenbacher (3): drbd: Rip out the ERR_IF_CNT_IS_NEGATIVE macro drbd: Add peer device parameter to whole-bitmap I/O handlers drbd: INFO_bm_xfer_stats(): Pass a peer device argument Christoph Böhmwalder (4): drbd: drbd_uuid_compare: pass a peer_device drbd: pass a peer_device to more bitmap functions drbd: pass drbd_peer_device to __req_mod drbd: Pass a peer device to the resync and online verify functions drivers/block/drbd/drbd_actlog.c | 13 ++-- drivers/block/drbd/drbd_bitmap.c | 13 +++- drivers/block/drbd/drbd_int.h | 119 +++++++++++++++-------------- drivers/block/drbd/drbd_main.c | 72 ++++++++++------- drivers/block/drbd/drbd_nl.c | 19 +++-- drivers/block/drbd/drbd_receiver.c | 102 +++++++++++++------------ drivers/block/drbd/drbd_req.c | 30 +++++--- drivers/block/drbd/drbd_req.h | 11 ++- drivers/block/drbd/drbd_state.c | 29 ++++--- drivers/block/drbd/drbd_worker.c | 114 ++++++++++++++------------- 10 files changed, 291 insertions(+), 231 deletions(-) base-commit: a06377c5d01eeeaa52ad979b62c3c72efcc3eff0