From nobody Mon Feb 9 00:06:31 2026 Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.219]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C830879E5; Fri, 2 Aug 2024 03:34:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.254.50.219 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722569664; cv=none; b=Y7hUQ0XpyNR9F0ue9p0Phb6kcOAyPcFXvJLYoeKkTxoRAThlNjMI3HILhRHx5x8NS3SM7pqQidMG9bQPiEpJsm2A78FDR9ne0i/FYJUOkZ76S6TqPfDbFmGlqeirsMlF8oIGz8wDlAsJnfGfgKZ+Ez0xLxioFqR6uRHvEhrJZMg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722569664; c=relaxed/simple; bh=c9LYv447jkClIZCyRVU4/SSilccjDZbekcdNBeAWqyE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=nOFI2ey9q5cBWldt7zsjbX4yaZIg8NHYlmXjcvoHqDBr/UTMoK2+cR1H8uqz6eypLgq3DJh7ajxgUqTVVkB36TkmOfAd8QAoy1/hGtRfBSWz3dlV/O8CLm2v1RhHiKOr+aY0nmSCOhjQc7XeHPNbuv++qf7UPxOpAbI95fJkAfw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=R3TzB12N; arc=none smtp.client-ip=45.254.50.219 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="R3TzB12N" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version: Content-Type; bh=2wVTAZKp38/iqKf5L1xSuiHjYrzf6ECDxicbmQEacio=; b=R3TzB12NRVjh/AAbjXow1r3tpEEpJshMZtfgKj7aYQh6uJqu1Ctaj9WXTzvUju eZwnfC6be0FhL4Lhba9sjRPakvIYucdSvc19qe407f2X+kz4HNKOt5zgRBonBXAz 0hqyDzJZgHt02cwx0n8C/LDHcCYhXVMg1Y+mVEryiMzpw= Received: from localhost (unknown [101.132.132.191]) by gzga-smtp-mta-g0-0 (Coremail) with SMTP id _____wDnr3mbU6xmOBGuAQ--.16994S2; Fri, 02 Aug 2024 11:33:48 +0800 (CST) From: Xavier To: tj@kernel.org, sfr@canb.auug.org.au Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, xavier_qy@163.com Subject: [PATCH v2] Documentation: Fix the compilation errors in union_find.rst Date: Fri, 2 Aug 2024 11:33:46 +0800 Message-Id: <20240802033346.468893-1-xavier_qy@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wDnr3mbU6xmOBGuAQ--.16994S2 X-Coremail-Antispam: 1Uf129KBjvJXoW3Jr1xAFW8trWkZw4UJrWfuFg_yoW7Xw43pF 9xKryfA3WUGryUCr18GrW7Xr13AFyfWayDGa18Jw18tr17Ar1Yyr4Utwn5tr95GryIyFy8 Xr43try8Z34jyrDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pi8R6rUUUUU= X-CM-SenderInfo: 50dyxvpubt5qqrwthudrp/1tbiYx8vEGV4JykXUgAAsV Fix the compilation errors and warnings caused by merging Documentation/core-api/union_find.rst and Documentation/translations/zh_CN/core-api/union_find.rst. Signed-off-by: Xavier --- Documentation/core-api/index.rst | 1 + Documentation/core-api/union_find.rst | 6 +++++- .../translations/zh_CN/core-api/index.rst | 1 + .../zh_CN/core-api/union_find.rst | 21 ++++++++++++------- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Documentation/core-api/index.rst b/Documentation/core-api/inde= x.rst index f147854700e..e18a2ffe078 100644 --- a/Documentation/core-api/index.rst +++ b/Documentation/core-api/index.rst @@ -49,6 +49,7 @@ Library functionality that is used throughout the kernel. wrappers/atomic_t wrappers/atomic_bitops floating-point + union_find =20 Low level entry and exit =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/Documentation/core-api/union_find.rst b/Documentation/core-api= /union_find.rst index 2bf0290c918..6df8b94fdb5 100644 --- a/Documentation/core-api/union_find.rst +++ b/Documentation/core-api/union_find.rst @@ -16,9 +16,11 @@ of disjoint sets. The primary operations supported by un= ion-find are: =20 Initialization: Resetting each element as an individual set, with each set's initial parent node pointing to itself. + Find: Determine which set a particular element belongs to, usually by returning a =E2=80=9Crepresentative element=E2=80=9D of that set. This o= peration is used to check if two elements are in the same set. + Union: Merge two sets into one. =20 As a data structure used to maintain sets (groups), union-find is commonly @@ -63,7 +65,7 @@ operation, the tree with the smaller rank is attached und= er the tree with the larger rank to maintain balance. =20 Initializing union-find --------------------- +----------------------- =20 You can complete the initialization using either static or initialization interface. Initialize the parent pointer to point to itself and set the ra= nk @@ -71,7 +73,9 @@ to 0. Example:: =20 struct uf_node my_node =3D UF_INIT_NODE(my_node); + or + uf_node_init(&my_node); =20 Find the Root Node of union-find diff --git a/Documentation/translations/zh_CN/core-api/index.rst b/Document= ation/translations/zh_CN/core-api/index.rst index 922cabf7b5d..453a02cd1f4 100644 --- a/Documentation/translations/zh_CN/core-api/index.rst +++ b/Documentation/translations/zh_CN/core-api/index.rst @@ -49,6 +49,7 @@ generic-radix-tree packing this_cpu_ops + union_find =20 =3D=3D=3D=3D=3D=3D=3D =20 diff --git a/Documentation/translations/zh_CN/core-api/union_find.rst b/Doc= umentation/translations/zh_CN/core-api/union_find.rst index a56de57147e..bb93fa8c653 100644 --- a/Documentation/translations/zh_CN/core-api/union_find.rst +++ b/Documentation/translations/zh_CN/core-api/union_find.rst @@ -3,21 +3,23 @@ =20 :Original: Documentation/core-api/union_find.rst =20 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D Linux=E4=B8=AD=E7=9A=84=E5=B9=B6=E6=9F=A5=E9=9B=86=EF=BC=88Union-Find=EF= =BC=89 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =20 =20 :=E6=97=A5=E6=9C=9F: 2024=E5=B9=B46=E6=9C=8821=E6=97=A5 :=E4=BD=9C=E8=80=85: Xavier =20 =E4=BD=95=E4=B8=BA=E5=B9=B6=E6=9F=A5=E9=9B=86=EF=BC=8C=E5=AE=83=E6=9C=89= =E4=BB=80=E4=B9=88=E7=94=A8=EF=BC=9F ---------------------- +------------------------ =20 =E5=B9=B6=E6=9F=A5=E9=9B=86=E6=98=AF=E4=B8=80=E7=A7=8D=E6=95=B0=E6=8D=AE= =E7=BB=93=E6=9E=84=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=A4=84=E7=90=86=E4=B8=80=E4= =BA=9B=E4=B8=8D=E4=BA=A4=E9=9B=86=E7=9A=84=E5=90=88=E5=B9=B6=E5=8F=8A=E6=9F= =A5=E8=AF=A2=E9=97=AE=E9=A2=98=E3=80=82=E5=B9=B6=E6=9F=A5=E9=9B=86=E6=94=AF= =E6=8C=81=E7=9A=84=E4=B8=BB=E8=A6=81=E6=93=8D=E4=BD=9C=EF=BC=9A - =E5=88=9D=E5=A7=8B=E5=8C=96=EF=BC=9A=E5=B0=86=E6=AF=8F=E4=B8=AA=E5=85=83= =E7=B4=A0=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=BA=E5=8D=95=E7=8B=AC=E7=9A=84=E9= =9B=86=E5=90=88=EF=BC=8C=E6=AF=8F=E4=B8=AA=E9=9B=86=E5=90=88=E7=9A=84=E5=88= =9D=E5=A7=8B=E7=88=B6=E8=8A=82=E7=82=B9=E6=8C=87=E5=90=91=E8=87=AA=E8=BA=AB + =E5=88=9D=E5=A7=8B=E5=8C=96=EF=BC=9A=E5=B0=86=E6=AF=8F=E4=B8=AA=E5=85=83= =E7=B4=A0=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=BA=E5=8D=95=E7=8B=AC=E7=9A=84=E9= =9B=86=E5=90=88=EF=BC=8C=E6=AF=8F=E4=B8=AA=E9=9B=86=E5=90=88=E7=9A=84=E5=88= =9D=E5=A7=8B=E7=88=B6=E8=8A=82=E7=82=B9=E6=8C=87=E5=90=91=E8=87=AA=E8=BA=AB= =E3=80=82 + =E6=9F=A5=E8=AF=A2=EF=BC=9A=E6=9F=A5=E8=AF=A2=E6=9F=90=E4=B8=AA=E5=85=83= =E7=B4=A0=E5=B1=9E=E4=BA=8E=E5=93=AA=E4=B8=AA=E9=9B=86=E5=90=88=EF=BC=8C=E9= =80=9A=E5=B8=B8=E6=98=AF=E8=BF=94=E5=9B=9E=E9=9B=86=E5=90=88=E4=B8=AD=E7=9A= =84=E4=B8=80=E4=B8=AA=E2=80=9C=E4=BB=A3=E8=A1=A8=E5=85=83=E7=B4=A0=E2=80=9D= =E3=80=82=E8=BF=99=E4=B8=AA=E6=93=8D=E4=BD=9C=E6=98=AF=E4=B8=BA =E4=BA=86=E5=88=A4=E6=96=AD=E4=B8=A4=E4=B8=AA=E5=85=83=E7=B4=A0=E6=98=AF= =E5=90=A6=E5=9C=A8=E5=90=8C=E4=B8=80=E4=B8=AA=E9=9B=86=E5=90=88=E4=B9=8B=E4= =B8=AD=E3=80=82 + =E5=90=88=E5=B9=B6=EF=BC=9A=E5=B0=86=E4=B8=A4=E4=B8=AA=E9=9B=86=E5=90=88= =E5=90=88=E5=B9=B6=E4=B8=BA=E4=B8=80=E4=B8=AA=E3=80=82 =20 =E5=B9=B6=E6=9F=A5=E9=9B=86=E4=BD=9C=E4=B8=BA=E4=B8=80=E7=A7=8D=E7=94=A8= =E4=BA=8E=E7=BB=B4=E6=8A=A4=E9=9B=86=E5=90=88=EF=BC=88=E7=BB=84=EF=BC=89=E7= =9A=84=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=EF=BC=8C=E5=AE=83=E9=80=9A=E5=B8= =B8=E7=94=A8=E4=BA=8E=E8=A7=A3=E5=86=B3=E4=B8=80=E4=BA=9B=E7=A6=BB=E7=BA=BF= =E6=9F=A5=E8=AF=A2=E3=80=81=E5=8A=A8=E6=80=81=E8=BF=9E=E9=80=9A=E6=80=A7=E5= =92=8C @@ -37,7 +39,7 @@ Linux=E4=B8=AD=E7=9A=84=E5=B9=B6=E6=9F=A5=E9=9B=86=EF=BC= =88Union-Find=EF=BC=89 https://en.wikipedia.org/wiki/Disjoint-set_data_structure =20 =E5=B9=B6=E6=9F=A5=E9=9B=86=E7=9A=84Linux=E5=AE=9E=E7=8E=B0 ----------------- +------------------ =20 Linux=E7=9A=84=E5=B9=B6=E6=9F=A5=E9=9B=86=E5=AE=9E=E7=8E=B0=E5=9C=A8=E6=96= =87=E4=BB=B6=E2=80=9Clib/union_find.c=E2=80=9D=E4=B8=AD=E3=80=82=E8=A6=81= =E4=BD=BF=E7=94=A8=E5=AE=83=EF=BC=8C=E9=9C=80=E8=A6=81 =E2=80=9C#include =E2=80=9D=E3=80=82 @@ -48,22 +50,25 @@ Linux=E7=9A=84=E5=B9=B6=E6=9F=A5=E9=9B=86=E5=AE=9E=E7= =8E=B0=E5=9C=A8=E6=96=87=E4=BB=B6=E2=80=9Clib/union_find.c=E2=80=9D=E4=B8= =AD=E3=80=82=E8=A6=81=E4=BD=BF=E7=94=A8=E5=AE=83=EF=BC=8C=E9=9C=80 struct uf_node *parent; unsigned int rank; }; + =E5=85=B6=E4=B8=ADparent=E4=B8=BA=E5=BD=93=E5=89=8D=E8=8A=82=E7=82=B9=E7= =9A=84=E7=88=B6=E8=8A=82=E7=82=B9=EF=BC=8Crank=E4=B8=BA=E5=BD=93=E5=89=8D= =E6=A0=91=E7=9A=84=E9=AB=98=E5=BA=A6=EF=BC=8C=E5=9C=A8=E5=90=88=E5=B9=B6=E6= =97=B6=E5=B0=86rank=E5=B0=8F=E7=9A=84=E8=8A=82=E7=82=B9=E6=8E=A5=E5=88=B0ra= nk=E5=A4=A7 =E7=9A=84=E8=8A=82=E7=82=B9=E4=B8=8B=E9=9D=A2=E4=BB=A5=E5=A2=9E=E5=8A=A0= =E5=B9=B3=E8=A1=A1=E6=80=A7=E3=80=82 =20 =E5=88=9D=E5=A7=8B=E5=8C=96=E5=B9=B6=E6=9F=A5=E9=9B=86 ---------- +------------- =20 =E5=8F=AF=E4=BB=A5=E9=87=87=E7=94=A8=E9=9D=99=E6=80=81=E6=88=96=E5=88=9D= =E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=88=90=E5=88=9D=E5=A7=8B=E5= =8C=96=E6=93=8D=E4=BD=9C=E3=80=82=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6=EF=BC= =8Cparent =E6=8C=87=E9=92=88=E6=8C=87=E5=90=91=E8=87=AA=E8=BA=AB=EF=BC=8Cra= nk =E8=AE=BE=E7=BD=AE =E4=B8=BA 0=E3=80=82 =E7=A4=BA=E4=BE=8B:: =20 struct uf_node my_node =3D UF_INIT_NODE(my_node); + =E6=88=96 + uf_node_init(&my_node); =20 =E6=9F=A5=E6=89=BE=E5=B9=B6=E6=9F=A5=E9=9B=86=E7=9A=84=E6=A0=B9=E8=8A=82= =E7=82=B9 ----------------- +------------------ =20 =E4=B8=BB=E8=A6=81=E7=94=A8=E4=BA=8E=E5=88=A4=E6=96=AD=E4=B8=A4=E4=B8=AA= =E5=B9=B6=E6=9F=A5=E9=9B=86=E6=98=AF=E5=90=A6=E5=B1=9E=E4=BA=8E=E4=B8=80=E4= =B8=AA=E9=9B=86=E5=90=88=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=A0=B9=E7=9B=B8=E5=90= =8C=EF=BC=8C=E9=82=A3=E4=B9=88=E4=BB=96=E4=BB=AC=E5=B0=B1=E6=98=AF=E4=B8=80= =E4=B8=AA=E9=9B=86=E5=90=88=E3=80=82=E5=9C=A8=E6=9F=A5=E6=89=BE=E8=BF=87=E7= =A8=8B=E4=B8=AD =E4=BC=9A=E5=AF=B9=E8=B7=AF=E5=BE=84=E8=BF=9B=E8=A1=8C=E5=8E=8B=E7=BC=A9= =EF=BC=8C=E6=8F=90=E9=AB=98=E5=90=8E=E7=BB=AD=E6=9F=A5=E6=89=BE=E6=95=88=E7= =8E=87=E3=80=82 @@ -78,7 +83,7 @@ Linux=E7=9A=84=E5=B9=B6=E6=9F=A5=E9=9B=86=E5=AE=9E=E7=8E= =B0=E5=9C=A8=E6=96=87=E4=BB=B6=E2=80=9Clib/union_find.c=E2=80=9D=E4=B8=AD= =E3=80=82=E8=A6=81=E4=BD=BF=E7=94=A8=E5=AE=83=EF=BC=8C=E9=9C=80 connected =3D 0; =20 =E5=90=88=E5=B9=B6=E4=B8=A4=E4=B8=AA=E5=B9=B6=E6=9F=A5=E9=9B=86 -------------- +-------------- =20 =E5=AF=B9=E4=BA=8E=E4=B8=A4=E4=B8=AA=E7=9B=B8=E4=BA=A4=E7=9A=84=E5=B9=B6= =E6=9F=A5=E9=9B=86=E8=BF=9B=E8=A1=8C=E5=90=88=E5=B9=B6=EF=BC=8C=E4=BC=9A=E9= =A6=96=E5=85=88=E6=9F=A5=E6=89=BE=E5=AE=83=E4=BB=AC=E5=90=84=E8=87=AA=E7=9A= =84=E6=A0=B9=E8=8A=82=E7=82=B9=EF=BC=8C=E7=84=B6=E5=90=8E=E6=A0=B9=E6=8D=AE= =E6=A0=B9=E8=8A=82=E7=82=B9=E7=A7=A9=E5=A4=A7=E5=B0=8F=EF=BC=8C=E5=B0=86=E5= =B0=8F=E7=9A=84 =E8=8A=82=E7=82=B9=E8=BF=9E=E6=8E=A5=E5=88=B0=E5=A4=A7=E7=9A=84=E8=8A=82= =E7=82=B9=E4=B8=8B=E9=9D=A2=E3=80=82 --=20 2.45.2