[v3,0/7] Assorted DRBD refactoring

Message

Christoph Böhmwalder March 30, 2023, 10:27 a.m. UTC

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.

Changes since v2:
- Rebase to for-6.4/block

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):
  genetlink: make _genl_cmd_to_str static
  drbd: drbd_uuid_compare: pass a peer_device
  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      | 120 +++++++++++++++--------------
 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 ++++++++++++++-------------
 include/linux/genl_magic_func.h    |   2 +-
 11 files changed, 293 insertions(+), 232 deletions(-)


base-commit: 06965037ce942500c1ce3aa29ca217093a9c5720

Comments

Jens Axboe April 2, 2023, 2:28 a.m. UTC | #1

On Thu, 30 Mar 2023 12:27:37 +0200, Christoph Böhmwalder wrote:
> 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.
> 
> Changes since v2:
> - Rebase to for-6.4/block
> 
> [...]

Applied, thanks!

[1/7] genetlink: make _genl_cmd_to_str static
      commit: 0d11f3cf279c5ad20a41f29242f170ba3c02f2da
[2/7] drbd: Rip out the ERR_IF_CNT_IS_NEGATIVE macro
      commit: 33f7d31673eb43298b25b0cca30acc487e8a332a
[3/7] drbd: Add peer device parameter to whole-bitmap I/O handlers
      commit: 8164dd6c8ae158ec0740bf37f0f14645a1fb5355
[4/7] drbd: INFO_bm_xfer_stats(): Pass a peer device argument
      commit: 5e54c2a6010bc88e33a5a66aa16c95fa5d017065
[5/7] drbd: drbd_uuid_compare: pass a peer_device
      commit: db445db1cde540f819265dcae2d916a35616bda0
[6/7] drbd: pass drbd_peer_device to __req_mod
      commit: ad878a0d8815a291a1cbb2dc8279dc2910c999cc
[7/7] drbd: Pass a peer device to the resync and online verify functions
      commit: 0d11f3cf279c5ad20a41f29242f170ba3c02f2da

Best regards,