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:     Gao Xiang <xiang@kernel.org>, Chao Yu <chao@kernel.org>,
        Yue Hu <huyue2@coolpad.com>,
        Jeffle Xu <jefflexu@linux.alibaba.com>
Cc:     Yangtao Li <frank.li@vivo.com>, linux-erofs@lists.ozlabs.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] erofs: remove unnecessary kobject_del()
Date:   Tue,  4 Apr 2023 22:21:02 +0800
Message-Id: <20230404142102.13226-2-frank.li@vivo.com>
In-Reply-To: <20230404142102.13226-1-frank.li@vivo.com>
References: <20230404142102.13226-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?2h/u2U4diDAUWqIZvttvyUqyMY7ukGVMMnTtgBYaq6lbnUKERwFk6Rg4AC4F?=
 =?us-ascii?Q?XF9XVxGya7ITOIWPITnTOhbPjuQCDGbV9MVjQE9UJCtZFNcsl8aCSdPJUP3p?=
 =?us-ascii?Q?nFzFNm/vxCCLk8kHW8Tm9wzHqQM071jNumg5SdLgynlxcSlc9S9ymTaxUpts?=
 =?us-ascii?Q?ZACZjSO+h+F8/m3WbLzs7MrmTu7BjaumMvvgEBfO1uNbmztiSQJcFa6YwzWe?=
 =?us-ascii?Q?LSHXzSjZOMXjaP3g+wkjTIuyngcF5Ct9lCx/oVTnuKyvgS1jw7JQ+19kh/v9?=
 =?us-ascii?Q?ym84z2sLwL660f3DAdLnW4t7sE8obmRgLB0ENUWe1SzMnZk6GeS3d7IRvj2D?=
 =?us-ascii?Q?v7Ddzq+ZFb2C6FrnE4bGEo2vtUEgeiqtBmR9EYc+7Z3dYkTvCLDjxxqUPjXG?=
 =?us-ascii?Q?P9Xyvn3b9aum6Ie8hEor8S92Wnav9Twx2sn4KSv2ZQLQFiezoqnuvqnAVMke?=
 =?us-ascii?Q?V2S/wvQwzj+QkUbjD7zjp0MWOV4x99alumz+WLA1S9pqGt5Y/AQiakuJgNS7?=
 =?us-ascii?Q?hZc1oVE9V9YGqzzrR7oDsaN74zuJCMMXCizQA5L2wlllu2QngQCMsGlaCDI2?=
 =?us-ascii?Q?zcmzl+j8Kic+3A0UsBmEOukhpO3GjvvEONDnaUNmVFCzJw25r3Dw7uqehK1z?=
 =?us-ascii?Q?i3iTY7sTWosvsdvhl5gwOdDQ+fALGleozPa3qNLjmg1t5nTlXhJ3v6WjCWJS?=
 =?us-ascii?Q?mqx/13bUGjg+dv3m2jvtatkanlFyZWtlZKIbxnRVP79wn7jDyIlexgq5yPxr?=
 =?us-ascii?Q?mq1TFe1TylYmUKLZcVCgtxgTgqTM7cr4uR+YCB6PIydH430PGJGC7qKZAeTT?=
 =?us-ascii?Q?H81m2DgABaSqNDgdgA9efPaDfCwZyJv+oGUlbKTMXKa9c6u/0y5TOENQA3+a?=
 =?us-ascii?Q?hsdBBk1P/raT8HlT2V7i6wX4Jd6g8yy96OZx/180x4Gh78spFm+672hlQu4Q?=
 =?us-ascii?Q?Tp2IBdDlBN1B5mVkrtLKjEsccmWCcKa2MCZrZ6u+hk9eCOf2Mc1EPESOmuXz?=
 =?us-ascii?Q?ACocEnBtEt4DpdbSr/0ohoNJV2GusTvmiayE0NyFE1nMIbaf7ga7Jpfnzvyj?=
 =?us-ascii?Q?05f55RTyZDIQt+oRNkanUPpjxkKq2c3b0b+2h94xj6vZNUuJEgsiRMgs2YQT?=
 =?us-ascii?Q?zWmCV+dfaI9FR22MxNwrsOdG1nK7DeLWK0SciOfm86pxsAQUroxVcNCRsj0E?=
 =?us-ascii?Q?crs6Swvrze++Af58WC4n0fuJox7svRyuapGMa7igl8m61uax+pxznrrSBcR3?=
 =?us-ascii?Q?5oGW+2PJquEGkzIr4CF/3vyoTvGcyw1pv+keVvovdkG29OlZ6JiYsKG6v3I4?=
 =?us-ascii?Q?caRdMYS2IjNijImvKofVTIXaa+T9/cb/WEY/drCMqlU/PDzGdl7ZUlJCoo5N?=
 =?us-ascii?Q?aitDdEtbvPPG9M6BunctQqB5vTnvzkV1Ry2afXxCqrQxSgpoRpv54ffT+k/o?=
 =?us-ascii?Q?TqUYvq9nCI+SD0sTjlkkAuUVnD639kJTDOdk6yqW0li/eifmuOfg+nmrzatk?=
 =?us-ascii?Q?+KQrCYEztqWNBpkiLfAjbDHR1kMp4NjPIBaXG73bk6IszY+Iix8aRSWeopyM?=
 =?us-ascii?Q?ciEHjCsJYE0XeZEn6Wn43WGRuXhOc5q/LAObLKGj?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5c4d76f0-efda-438c-4da8-08db3517dba5
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2023 14:21:19.1068
 (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: d+2YK0yB8HhBCuF/nC+WbQlr1kTaI+eXBT3oRFW7VumNJ/Tft+2pc5Wbtv0W4jQuiEfize7Csce6VIni9t8yhw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4641
X-Spam-Status: No, score=1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        RCVD_IN_VALIDITY_RPBL,SPF_HELO_PASS,SPF_PASS autolearn=no
        autolearn_force=no version=3.4.6
X-Spam-Level: *
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

kobject_put() actually covers kobject removal automatically, which is
single stage removal. So it is safe to kill kobject_del() directly.

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

diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c
index 435e515c0792..c3ba981b4472 100644
--- a/fs/erofs/sysfs.c
+++ b/fs/erofs/sysfs.c
@@ -240,11 +240,8 @@ void erofs_unregister_sysfs(struct super_block *sb)
 {
 	struct erofs_sb_info *sbi = EROFS_SB(sb);
 
-	if (sbi->s_kobj.state_in_sysfs) {
-		kobject_del(&sbi->s_kobj);
-		kobject_put(&sbi->s_kobj);
-		wait_for_completion(&sbi->s_kobj_unregister);
-	}
+	kobject_put(&sbi->s_kobj);
+	wait_for_completion(&sbi->s_kobj_unregister);
 }
 
 int __init erofs_init_sysfs(void)
-- 
2.35.1