From patchwork Thu Mar 2 12:54:43 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: 63415 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4221838wrd; Thu, 2 Mar 2023 05:04:14 -0800 (PST) X-Google-Smtp-Source: AK7set++IBIEfuHpsZ9m0Q2aXfs0wmKFcxXzzZIbw+SFonzQ4BnZ2ly8tX1q/HuGbZ85WYP0n24i X-Received: by 2002:a17:906:6851:b0:88c:780c:770e with SMTP id a17-20020a170906685100b0088c780c770emr9033508ejs.32.1677762254047; Thu, 02 Mar 2023 05:04:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677762254; cv=none; d=google.com; s=arc-20160816; b=Lfs9SaY7GLBnuC+6twmXTxZvt9fe23U5301CdXSXhNkte5b7GevvXHlLUWeEebH8M4 mHpup2BDnn41M5IhZDXUg/Ott/A+5fczbEIj5IP91LCHrvZTMnMhYHQIDzAfO+Tzrv2s VITDtuDJhVVgC0ZGnmGMxoeujcoIr6AEvV0UmqMjfLak7ZikLGn95hzFF5y7qqoIVwTl KPp1CghhwvCIMjiGrByYMSUYzF/NxKU6VVe5E9HndJCb+rNsQk8lUmJP5PG0IWNNqmW8 Tn7NDJYAWmgfc3Vz5LOYpZG5fRn6rsy2ARLG62CR/qR7Cs/7QINw8ydGgW9cndOn6xzF GXTA== 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=1kxDLEHqeSUzC07bB1oJ0MhsEczzoLXd9EtZFkAmxP8=; b=JVaRPgfyjk8l/I/rrTzWgw42+k/z6VLN4SmQoaG5vf9bHIFgp5peZjujKi0eSiH83F d+LzZLkdNQBbUER203+wn4mGfERZDOI1jVIAZ00dJ3FsB83nuJhHxGdq7/H45XALIfPj V5jQS8Ot5w6mgY3wroe0kJ/saG2hAnPOghfr1rCAAHsUlgcDe7QoqGwwAVllwqv9pfIz 7pnAS9kRaUbBPQmLC0NAb9dO0FxeC4D7HPwAwrETEiZ9zWshK2ei7dbjNS7ARGgA/A90 PArZqgBbwL76L5hn66sZHaDDddOHC6buq3V8OKz593ooGA4qxxDaRyhYdEqvnFt2+YWN Nhaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linbit-com.20210112.gappssmtp.com header.s=20210112 header.b=VsQz9Fhd; 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 x12-20020a170906804c00b008b17662c9dasi18480752ejw.713.2023.03.02.05.03.50; Thu, 02 Mar 2023 05:04:14 -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=VsQz9Fhd; 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 S229844AbjCBM4D (ORCPT + 99 others); Thu, 2 Mar 2023 07:56:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229925AbjCBMzj (ORCPT ); Thu, 2 Mar 2023 07:55:39 -0500 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C33634E5C3 for ; Thu, 2 Mar 2023 04:55:31 -0800 (PST) Received: by mail-ed1-x52a.google.com with SMTP id o12so67112735edb.9 for ; Thu, 02 Mar 2023 04:55:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linbit-com.20210112.gappssmtp.com; s=20210112; t=1677761730; 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=1kxDLEHqeSUzC07bB1oJ0MhsEczzoLXd9EtZFkAmxP8=; b=VsQz9FhdRKRUmHZD9G4GNRJ454L7tKxaTS345k7aLCTJeR+OHIfOvpLCuA5wndRXlC 82gkRGUj4ue7MyzthafS9UNIdwK67PDkzgOzVxHEt61mqB/o3NQ1iMVBL/WO8TtYDNQ3 H3a0UNzaJB/wFAVc8oZ9YrdQyclihBoBAHrG84vDbmO/Lren53oZB6ry6cnosf4kuluN eGhi2ThiEJmCiClCbNyyUUM+1HyoPiWEO9ZkTzA/AA+xkDEtsW+h0OO4vXiCP8OWvl9b SSfN3UwdSzg6qL1af6CzPCgx1C0GUe9Z9J2jGME76Thl9G8izfhtspgH2aUN3tg0uCuB 7mRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677761730; 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=1kxDLEHqeSUzC07bB1oJ0MhsEczzoLXd9EtZFkAmxP8=; b=hNfDN31lyDuvB0TQd6eFefVMSypEsJA62lFdlLV8r4bVxr2hLUvHG+0ACh0jTsTVBH USA72TFSKRoriOFUQZeJTIH4U/ltZs44QGPU2SUaQ3jn3o8DRWToJ0mr9DqebX9LBWhp NWEbY/KzsHhTK26nK3P2+AkYrAH3V79B2Gv/bRlL0p9tyX20wWl+ZyDFUF1cEBj1Ugpp HObsXJBnfXCC84i4Zr6LlHtI6dAFgIf/T4olCVQ3oI7mMbw5VeJcJk6Unp9bdSiBbElD Vfv5tL2Tm2ndE7RLcqtql/lJqjJJd5DssIYAFwHocKvfhSERJLvzO9ksGaFkgMwbw1zZ qM8w== X-Gm-Message-State: AO0yUKVg/rpkaIuCaGLvKUsEvc8gZX7eccjYLkIzEwZd8GT+X3m+RvXs +CjtNwy+UIMTOubVJ4tHBhHB7ZuPeW2KcZra9Etsjw== X-Received: by 2002:aa7:c91a:0:b0:4af:5aa1:6e58 with SMTP id b26-20020aa7c91a000000b004af5aa16e58mr11277992edt.21.1677761730423; Thu, 02 Mar 2023 04:55:30 -0800 (PST) Received: from localhost.localdomain (h082218028181.host.wavenet.at. [82.218.28.181]) by smtp.gmail.com with ESMTPSA id a98-20020a509eeb000000b004ad601533a3sm6955034edf.55.2023.03.02.04.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 04:55:30 -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 v2 5/7] drbd: drbd_uuid_compare: pass a peer_device Date: Thu, 2 Mar 2023 13:54:43 +0100 Message-Id: <20230302125445.2653493-6-christoph.boehmwalder@linbit.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230302125445.2653493-1-christoph.boehmwalder@linbit.com> References: <20230302125445.2653493-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?1759261233372595534?= X-GMAIL-MSGID: =?utf-8?q?1759261233372595534?= Signed-off-by: Christoph Böhmwalder --- drivers/block/drbd/drbd_receiver.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index c6f93a9087b1..e352880c70b5 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3226,10 +3226,11 @@ static void drbd_uuid_dump(struct drbd_device *device, char *text, u64 *uuid, -1096 requires proto 96 */ -static int drbd_uuid_compare(struct drbd_device *const device, enum drbd_role const peer_role, int *rule_nr) __must_hold(local) +static int drbd_uuid_compare(struct drbd_peer_device *const peer_device, + enum drbd_role const peer_role, int *rule_nr) __must_hold(local) { - struct drbd_peer_device *const peer_device = first_peer_device(device); - struct drbd_connection *const connection = peer_device ? peer_device->connection : NULL; + struct drbd_connection *const connection = peer_device->connection; + struct drbd_device *device = peer_device->device; u64 self, peer; int i, j; @@ -3465,7 +3466,7 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_peer_device *peer_device, drbd_uuid_dump(device, "peer", device->p_uuid, device->p_uuid[UI_SIZE], device->p_uuid[UI_FLAGS]); - hg = drbd_uuid_compare(device, peer_role, &rule_nr); + hg = drbd_uuid_compare(peer_device, peer_role, &rule_nr); spin_unlock_irq(&device->ldev->md.uuid_lock); drbd_info(device, "uuid_compare()=%d by rule %d\n", hg, rule_nr);