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;
From:   Yangtao Li <frank.li@vivo.com>
To:     xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com,
        jefflexu@linux.alibaba.com, damien.lemoal@opensource.wdc.com,
        naohiro.aota@wdc.com, jth@kernel.org, gregkh@linuxfoundation.org,
        rafael@kernel.org
Cc:     linux-erofs@lists.ozlabs.org, linux-kernel@vger.kernel.org,
        linux-fsdevel@vger.kernel.org, Yangtao Li <frank.li@vivo.com>
Subject: [PATCH 3/3] zonefs: convert to use kobject_is_added()
Date:   Thu,  6 Apr 2023 17:30:56 +0800
Message-Id: <20230406093056.33916-3-frank.li@vivo.com>
In-Reply-To: <20230406093056.33916-1-frank.li@vivo.com>
References: <20230406093056.33916-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lMO92vDo2PiinmK+5c8YUwipt+pEEdLz1T4Orjm6Cz1yFsMx+enxLGll44nN?=
 =?us-ascii?Q?IU8s/e+eFk4tuM21297baNvI8UYNRy52wA0mzWYb6v7XkJDoJh6xXryuqx+3?=
 =?us-ascii?Q?uRBceXvcLqLEbl8W+vtazYgMvAHfl2Jt154b8/qgzn1rVADUgRDDyHByNsjy?=
 =?us-ascii?Q?Bc3k3TY2tYN1yC492mpRRv7we+oK82g4U3mA5/gI5RCcXmfdQdQWvY4DtkB1?=
 =?us-ascii?Q?5W7wyH7G7jJNV+YC8b4SwenHNKnAJBtrn9mGzistOte4fzA9D0/ddW83UEcV?=
 =?us-ascii?Q?m5xE9VDPErHuP2v5o6EzR+Oc/+ErKntEVUxq6MbB+98/zDpMUVk8jVqOXmXp?=
 =?us-ascii?Q?7JripNCJ4CHHShoBFV6QVgqVPXinf0q1dUAcd96vZpJ5/y/fvea9IbbF+ane?=
 =?us-ascii?Q?wAnfIObca9NiWPnk/kKeQbYjovFb0q3eGJHw0QdrbHRlIwXdoYjO3VAFwE/P?=
 =?us-ascii?Q?RUK8o2IR9ohEfpazqU1eswjry6C4T9T8Rh3ZpigOb+Z+wa+XC8PRoHkQ8Sc5?=
 =?us-ascii?Q?HQZMXO+yBGuo/xvxoA6sML0ofkHCn3xWuG/SV8qTofYOBu/LSSlLWFV+uXGM?=
 =?us-ascii?Q?3BmKnEjhk1Wjv7cyLMG5TUQPfuoUOYX5ncSZ8aq5/ouTybdHlg8ynCvWnY7F?=
 =?us-ascii?Q?OLtsfpfhrJeWetvBZ6DOMPN5CzwezfanwcT5gn4ly4sHD5pCz2viIlR8NOR2?=
 =?us-ascii?Q?sfkPPtUn+Jsie6AuFahjz3VqYhGzLOm1Uy53MPM6GekZ9O6enrnozCuuwEZM?=
 =?us-ascii?Q?3mKpzg3LMuohljD1oRGght0/DjHF3jcINnfiTKPHwMTXs9bIF/Qzo41j8B6I?=
 =?us-ascii?Q?poWs9KUaN1Q3l7XqpnUVmDY1825gH872CoyXiSR0jG+/YdINIe9pnQ59SwIt?=
 =?us-ascii?Q?FY1eCiCG/3NfXi54ys6kYE4Ssf/0h6y9BV2j/ItlHsmvmiryixKB5YYITjxI?=
 =?us-ascii?Q?9AO1XWJr4qYScyd8e3SQY4uPWK4tyxgss9hovQYiTHJQ2wn3N6tOfuGGc0fd?=
 =?us-ascii?Q?t0MRWS0na9cIKEpxxzV5EsGOe6cLVf9PWjfXH6ueXafakabV8IT+wlSNFrJC?=
 =?us-ascii?Q?vr3y/Dj1mYwNoIv24ierBN3Fl7V5ptR6JFNvAeTLxkE8SWgtUakNXRRzKb7j?=
 =?us-ascii?Q?GYFnszINSuWjq/AxzhVRC4g2xSTPePj4mxJoDxTSQLnn/r2x+3nYjV4u9Sr9?=
 =?us-ascii?Q?jfn07+O1hhnPQE2sWuklk7sA3qB/vCJFV905sHRsSX2uuc735FsNo70go4rf?=
 =?us-ascii?Q?vQPWoIiB9Qir5Q9Fjje7Rb/ks992UtQI/PZuFOKdPVb0z9Nh+LZoqgkASWuU?=
 =?us-ascii?Q?73gfco6esjuY+OlQS5+0qAcgc8giylsC0utynVBhEr/Y16g/Qu3AJc581m18?=
 =?us-ascii?Q?UPFM+tbfvQsxGGXPj0ZhTLooiyJvjx6Q2MTEa5VEQRlSLL3BdbN1WlTG3Xu7?=
 =?us-ascii?Q?8Qhei9BasYCwM3DrCuxpxgsbPJevuSOvbWZ5TM/dYUyYFsjk2/gP7+B1v2Xm?=
 =?us-ascii?Q?W7FdVJ/DNOUu8UGjYV1T/oJwpMtS6i2wCK74FSwk8ygOA3xsJ/DuOULUrie8?=
 =?us-ascii?Q?Vy0ZBm40z+tT80+AOK/U2tLygpqUSZv22WgzOMkW?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 89492d96-0959-42d3-9c3d-08db3681aae8
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB5275.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2023 09:31:15.0418
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: VLclSE4et47LFAX8qAr0rbSbYogvfxKwL0Kzh41GBFK4BqXHGeTMRW0RwsDFfxdOF5OwB6LAk274bGl10hORRA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR06MB5772
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Use kobject_is_added() instead of local `s_sysfs_registered` variables.
BTW kill kobject_del() directly, because kobject_put() actually covers
kobject removal automatically.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/zonefs/sysfs.c  | 11 +++++------
 fs/zonefs/zonefs.h |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/fs/zonefs/sysfs.c b/fs/zonefs/sysfs.c
index 8ccb65c2b419..f0783bf7a25c 100644
--- a/fs/zonefs/sysfs.c
+++ b/fs/zonefs/sysfs.c
@@ -101,8 +101,6 @@ int zonefs_sysfs_register(struct super_block *sb)
 		return ret;
 	}
 
-	sbi->s_sysfs_registered = true;
-
 	return 0;
 }
 
@@ -110,12 +108,13 @@ void zonefs_sysfs_unregister(struct super_block *sb)
 {
 	struct zonefs_sb_info *sbi = ZONEFS_SB(sb);
 
-	if (!sbi || !sbi->s_sysfs_registered)
+	if (!sbi)
 		return;
 
-	kobject_del(&sbi->s_kobj);
-	kobject_put(&sbi->s_kobj);
-	wait_for_completion(&sbi->s_kobj_unregister);
+	if (kobject_is_added(&sbi->s_kobj)) {
+		kobject_put(&sbi->s_kobj);
+		wait_for_completion(&sbi->s_kobj_unregister);
+	}
 }
 
 int __init zonefs_sysfs_init(void)
diff --git a/fs/zonefs/zonefs.h b/fs/zonefs/zonefs.h
index 8175652241b5..4db0ea173220 100644
--- a/fs/zonefs/zonefs.h
+++ b/fs/zonefs/zonefs.h
@@ -238,7 +238,6 @@ struct zonefs_sb_info {
 	unsigned int		s_max_active_seq_files;
 	atomic_t		s_active_seq_files;
 
-	bool			s_sysfs_registered;
 	struct kobject		s_kobj;
 	struct completion	s_kobj_unregister;
 };
-- 
2.35.1