From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02FE1215F4B for ; Mon, 17 Feb 2025 10:20:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739787634; cv=none; b=o097I7oLwQ4lNh0Er+T8mdzM0omZ0jRjlAJgD6UXlA6SKgTzdVmLQXdRxJd0FCrcy8DeIoIk+cdgriKXpVCxofz0f+24fllZfhlr787oyyvBAFTRP1Yl4SC9fsc5TuBe5uHJbjcdlCrr9f6BcdNdSg1yZveOr7IpblzF9cWd0c4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739787634; c=relaxed/simple; bh=Ni8XhWFL3JofyQtJuW4RPnrReMge+P3PaWcygEu16Ig=; h=Content-Type:Mime-Version:Subject:From:In-Reply-To:Date:Cc: Message-Id:References:To; b=AMCHgyDhK6XrfDhSo53qxTXpvlgRw1qivi0Et5BDXymGib4tHgEWc0B9iNYgLgHoMwA2B7Aa+OUQ+GAtZakpqVlIbE3ySTuohLVk0/fa6oCJ8QdOEQfHc6/FapFtT76L7sBJsQ6jF+gGSE2VPGvYiVeNz/a19K/sVnVgYW35dkQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=Ki4cB+0V; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="Ki4cB+0V" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-38f2f391864so1577355f8f.3 for ; Mon, 17 Feb 2025 02:20:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1739787629; x=1740392429; darn=vger.kernel.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=L6DTmgyKwXyxupGvGcbs4sr/KU+osTL6h5aaa2lsjPg=; b=Ki4cB+0VBMFa1ZOjWkEycQB/VzeiIsPaG6sRuoaLWD4bXM4WsKbbYRlMBBrHqEAi/Y IKXL22ekOc+nY2FlexSyPr4trtisG5GNJ569klNnS5AA3o4kLIW2z00/NGjWrXlI6ySJ 60HcBsRYF95iqnEwGBV3M+mrxzziR7RagKynBjVNZdyZPuPwMsQTLexAalr8Bb41qZNR 6ltt63Ol3I0dTXcsLUAIzmr4XByUNFawXvFYgU3vtClJIYjA8r+dcTleil22qVTmmlH9 jHCrENqTk3HFSNKwWq3pacLckSkoX0lZxPQUvX66bYfAWitFlZmv2O6AJ8CeArlRXC4h GrBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739787629; x=1740392429; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L6DTmgyKwXyxupGvGcbs4sr/KU+osTL6h5aaa2lsjPg=; b=QM7Sv9BLs5hve9sY3y3wkMaBahqEj4Ja0FDR976hUGmh9FwkmQV4pfUBysu6Rx9x8j qUgBE2aMaRWzx1kpBTlbrJ3UWeBUnUVH73VWYwJ6SVy6nXqYHtmt/4FiaDgN6WDa+FAa 8ZqAk8EoC7C9hlHxiXUowRrNpFUsBQoEjcAZF/4FiAGtgusnNu/Zo+G8/DBRixFQ5e+w 48MQHG8IlYHVea1jf6fV4GVk3xQ0K4q66Y57BND483XhR0BrAnr0L1sh2iw1LrgxEwUK tzLyeFPX/MmOEUzllNfJj5j/jtyjH4SnMfATGO5kbWxYtTzHEu7Iw4xuPh0Rbq8tElUn CHXg== X-Forwarded-Encrypted: i=1; AJvYcCUte7xv4Q5Pt/3HxmEk+K+Zl56qVlF/7FCskXq4mIkxXtXQA/5pJshX2ABJyAQB0QRTcwCrWoDw+mp6+aY=@vger.kernel.org X-Gm-Message-State: AOJu0YxTkBLIKBLCkghOifaSc6yZXVA+VmMt3RloMKTr1jg41TWTtjmc El79Po2KHt1NARgA2/7Lq6adkP6yE1PdxAKrJ2xyHpmb1D4GsTpWDdMop9e04cE= X-Gm-Gg: ASbGncuBns2fxw3sKqItzx0wYVYw/Z0fUuwefuOr2GWZbgwpRuY3j9fnqT3UxET47zP VFceDfHlY4W92ew+6mi15G7moqlNDcE6HvC86Jng3UcZQM8hp4Z9kumhFXGuDRF29DUZB9G4Ej0 VzNmhMrFO0ubJ/gTwPths75NyuSCg9NUM3U6KV0JZJcPL4hADtGtoET+843nuPJ3NgvPEji7FvV 0R1bI27/fVYfJxAsQBWHqfs1cgSYZFR5ObFVNugO49xozbTL6BghkvdeftZL0sGNpFX3rZ/78f2 qQlaN4W6VWZZ0XII8Q== X-Google-Smtp-Source: AGHT+IGviKjWNxy/sgElxSlyaT5/wAb+sw7oOQppRq5E3qnNTYAp1n89b2Fs/XnmQnd+QyM2KMyDaA== X-Received: by 2002:a05:6000:1787:b0:38f:443b:48f4 with SMTP id ffacd0b85a97d-38f443b4aefmr2784345f8f.49.1739787629473; Mon, 17 Feb 2025 02:20:29 -0800 (PST) Received: from smtpclient.apple ([23.247.139.15]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c07c5f357dsm516160885a.23.2025.02.17.02.20.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Feb 2025 02:20:29 -0800 (PST) Content-Type: text/plain; charset=us-ascii Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.400.131.1.6\)) Subject: Re: [PATCH md-6.15 2/7] md: only include md-cluster.h if necessary From: Glass Su In-Reply-To: <20250215092225.2427977-3-yukuai1@huaweicloud.com> Date: Mon, 17 Feb 2025 18:20:11 +0800 Cc: song@kernel.org, yukuai3@huawei.com, linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, yi.zhang@huawei.com, yangerkun@huawei.com Content-Transfer-Encoding: quoted-printable Message-Id: References: <20250215092225.2427977-1-yukuai1@huaweicloud.com> <20250215092225.2427977-3-yukuai1@huaweicloud.com> To: Yu Kuai X-Mailer: Apple Mail (2.3826.400.131.1.6) > On Feb 15, 2025, at 17:22, Yu Kuai wrote: >=20 > From: Yu Kuai >=20 > md-cluster is only supportted by raid1 and raid10, there is no need to > include md-cluster.h for other personalities. >=20 > Also move APIs that is only used in md-cluster.c from md.h to > md-cluster.h. >=20 > Signed-off-by: Yu Kuai Reviewed-by: Su Yue > --- > drivers/md/md-bitmap.c | 2 ++ > drivers/md/md-cluster.h | 7 +++++++ > drivers/md/md.h | 7 ------- > drivers/md/raid1.c | 1 + > drivers/md/raid10.c | 1 + > 5 files changed, 11 insertions(+), 7 deletions(-) >=20 > diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c > index 23c09d22fcdb..71aa7dc80e26 100644 > --- a/drivers/md/md-bitmap.c > +++ b/drivers/md/md-bitmap.c > @@ -29,8 +29,10 @@ > #include > #include > #include > + > #include "md.h" > #include "md-bitmap.h" > +#include "md-cluster.h" >=20 > #define BITMAP_MAJOR_LO 3 > /* version 4 insists the bitmap is in little-endian order > diff --git a/drivers/md/md-cluster.h b/drivers/md/md-cluster.h > index 470bf18ffde5..6c7aad00f5da 100644 > --- a/drivers/md/md-cluster.h > +++ b/drivers/md/md-cluster.h > @@ -35,4 +35,11 @@ struct md_cluster_operations { > void (*update_size)(struct mddev *mddev, sector_t old_dev_sectors); > }; >=20 > +extern int register_md_cluster_operations(const struct = md_cluster_operations *ops, > + struct module *module); > +extern int unregister_md_cluster_operations(void); > +extern int md_setup_cluster(struct mddev *mddev, int nodes); > +extern void md_cluster_stop(struct mddev *mddev); > +extern void md_reload_sb(struct mddev *mddev, int raid_disk); > + > #endif /* _MD_CLUSTER_H */ > diff --git a/drivers/md/md.h b/drivers/md/md.h > index def808064ad8..c9bc70e6d5b4 100644 > --- a/drivers/md/md.h > +++ b/drivers/md/md.h > @@ -19,7 +19,6 @@ > #include > #include > #include > -#include "md-cluster.h" >=20 > #define MaxSector (~(sector_t)0) >=20 > @@ -845,11 +844,6 @@ static inline void safe_put_page(struct page *p) >=20 > extern int register_md_personality(struct md_personality *p); > extern int unregister_md_personality(struct md_personality *p); > -extern int register_md_cluster_operations(const struct = md_cluster_operations *ops, > - struct module *module); > -extern int unregister_md_cluster_operations(void); > -extern int md_setup_cluster(struct mddev *mddev, int nodes); > -extern void md_cluster_stop(struct mddev *mddev); > extern struct md_thread *md_register_thread( > void (*run)(struct md_thread *thread), > struct mddev *mddev, > @@ -906,7 +900,6 @@ extern void md_idle_sync_thread(struct mddev = *mddev); > extern void md_frozen_sync_thread(struct mddev *mddev); > extern void md_unfrozen_sync_thread(struct mddev *mddev); >=20 > -extern void md_reload_sb(struct mddev *mddev, int raid_disk); > extern void md_update_sb(struct mddev *mddev, int force); > extern void mddev_create_serial_pool(struct mddev *mddev, struct = md_rdev *rdev); > extern void mddev_destroy_serial_pool(struct mddev *mddev, > diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c > index 9d57a88dbd26..e55db07e43d4 100644 > --- a/drivers/md/raid1.c > +++ b/drivers/md/raid1.c > @@ -36,6 +36,7 @@ > #include "md.h" > #include "raid1.h" > #include "md-bitmap.h" > +#include "md-cluster.h" >=20 > #define UNSUPPORTED_MDDEV_FLAGS \ > ((1L << MD_HAS_JOURNAL) | \ > diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c > index efe93b979167..3df39b2399b2 100644 > --- a/drivers/md/raid10.c > +++ b/drivers/md/raid10.c > @@ -24,6 +24,7 @@ > #include "raid10.h" > #include "raid0.h" > #include "md-bitmap.h" > +#include "md-cluster.h" >=20 > /* > * RAID10 provides a combination of RAID0 and RAID1 functionality. > --=20 > 2.39.2 >=20 >=20