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>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        Damien Le Moal <damien.lemoal@opensource.wdc.com>,
        linux-erofs@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 03/10] erofs: convert to kobject_del_and_put()
Date:   Thu, 23 Mar 2023 00:58:58 +0800
Message-Id: <20230322165905.55389-2-frank.li@vivo.com>
In-Reply-To: <20230322165905.55389-1-frank.li@vivo.com>
References: <20230322165905.55389-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?6PMzENuswHEjU5t/l9xsPxxaa868TJMzYdajTv1mTyVu9UxS1ukDTLkyL6Ov?=
 =?us-ascii?Q?YTSQcMrwmTifM/mcpf8pkuNBmHIsRuQXG4bNmBK7yiZVu0h9wnMw6q9j22OZ?=
 =?us-ascii?Q?wXI1VMJ214DtxtibCrd9GRzRNiTSOYcJdPF1eI7OmGGPQW1ZlFD8l88DebS6?=
 =?us-ascii?Q?RPSB+dj3yZ4tXzCNHeRh64fkwSClZkHI3WdLxXS98CrXQsHLhKnTw+HAgrsj?=
 =?us-ascii?Q?S95NFKugAzK9knQTGpZpKQEAcybzV0VvUHA9x5bdpZVtgyDnjDkNYyqm8BFO?=
 =?us-ascii?Q?oSrSsWhkSVDH6a29+ucJQah1EG4iidgCiSRj6aZClbWd19kELTwZa1xH7yvL?=
 =?us-ascii?Q?WRbQ97q3/u8OysJ8UPCOKISPhQt+q4LNqSQQWXEvkpS1UuattIEUxxmn7AJr?=
 =?us-ascii?Q?2WLRpf29d86lB9X4rsAtFVnJv5L/dEUl9EUbq7VrFbnGHa1+ITQmf8tXJDes?=
 =?us-ascii?Q?PsqZ0SRYHht4X9F0zST3pSqxTojyJf28InPJc3uNXvcYrcUS/hOLJxAxjKSg?=
 =?us-ascii?Q?ET6AcvDSoMhRDH3X6oHrt4SfmNoC26uBv3SvS2u1C+hTEl2hr9ohSz1yTcOg?=
 =?us-ascii?Q?2JBiAzWqousTzDAbxy7Ey787iFeNu7GprzouGwce/atPjQ2yZ78JxVRNTqBo?=
 =?us-ascii?Q?1LgquwCWL6Qdcxfc7X+z8OWSfCMyhKGVOn5TFiVUTjMXoBX7pC308IJ+7tte?=
 =?us-ascii?Q?G/kka8K3u89KTxI3j+JeNeU2B32bKi8emqgIvw5pn7KjRLY0CeoxaQOmj6Dd?=
 =?us-ascii?Q?wE4LlA8l2IxSznDa45BDMGJErSVLW2DsIvLwlKsreoavqEm3VhpKACMP4Irw?=
 =?us-ascii?Q?Qj8MWPD/FoFopgeVSiIQI0MxFgl6wfCKaMNGW6NzamYcKsDaLRfvcAfsKrQH?=
 =?us-ascii?Q?ly4MO43SWA+GJE3va5pk40mi4VlK5r3lrJfvkQyc8YtUsV72JjCWtn3Deddx?=
 =?us-ascii?Q?tDvLD3cUEE68UGUWJ+TndQoX9eBo9bDE3uyv/ABGd0mvLZMTT2GN00OsJpMi?=
 =?us-ascii?Q?CK9NYOdP0gqPS6XMZmgCSCTrcIAIgu5p0ZVOJpIjF3XmGUYQ5evk/V5d5BZf?=
 =?us-ascii?Q?iAOm2+xVOb29T6OQCwKcM5aJWWncFiNvn/fxOse3JYQ7CRjDeTMO/9v0YpCW?=
 =?us-ascii?Q?7MBebbicZEe5WfyaUR2yIsnJc+wc2p+q5EtokHMQaUhuDCXtf5uu/YLyN2Xk?=
 =?us-ascii?Q?EQVwJ18H0dnIUw/MT7LJ3D9dm8qOHIfJI413qbYMtyU8ctoCZha8JmLQ6YNh?=
 =?us-ascii?Q?rvh76GXnWGY0/3PtHX/Y0WYM/RUgNvT9sIjfftVvrM6ift2AuOC1uJJ0+OdL?=
 =?us-ascii?Q?COjjz35nUxE2EWtq5d1jZD987IRWxZAshGNRq6PajRSJyTvhpWWyAUdkda+u?=
 =?us-ascii?Q?a11cWGzEauJkarv4UEAPa0C0Qtrb1hf2GXI1bsP7dYmzDJXSC5ivmAv8jYN+?=
 =?us-ascii?Q?nW0yIfxSmDHHSR8rUeH/8hwTv7/FmHYcl4l4pX1iXiK7tcNRfzfppPNVJPMq?=
 =?us-ascii?Q?ETLOUuaCN+TSg5qiE3KpR1FtJLqqnP75rvyts3wT5ox8RIaI8mlJzgEbilSS?=
 =?us-ascii?Q?0u5v58yXAX2kUIrfTCemSuWHWGn8QF2g3lj4bJTN?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d89c2428-7efe-4647-4dbc-08db2af6cfd7
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 16:59:34.3509
 (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: lz9ovNjaymPachLyjewdT90IjkHX77kfsey2EeFVRaqO9xKiu9vVgTrtVywED52BPulRWHfo+RoamMWxeD4w4A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB5238
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,URIBL_BLOCKED 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_del_and_put() to simplify code.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/erofs/sysfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c
index 435e515c0792..9ed7d6552155 100644
--- a/fs/erofs/sysfs.c
+++ b/fs/erofs/sysfs.c
@@ -241,8 +241,7 @@ 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);
+		kobject_del_and_put(&sbi->s_kobj);
 		wait_for_completion(&sbi->s_kobj_unregister);
 	}
 }
-- 
2.35.1