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:     Mark Fasheh <mark@fasheh.com>, Joel Becker <jlbec@evilplan.org>,
        Joseph Qi <joseph.qi@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>,
        ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org
Subject: [PATCH v3 08/10] ocfs2: convert to kobject_del_and_put()
Date:   Thu, 23 Mar 2023 00:59:03 +0800
Message-Id: <20230322165905.55389-7-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?l1+S78XpM+CouZwXt1Rk4latGQCVLb076NKHd2zuNPYX1hdzVsV/ZWJHVZZ+?=
 =?us-ascii?Q?FF4UnA+okT9atxx0BDVVrwnSxh+X6SvJm0GSarID8qfoev9QUn+jVZJBSfxT?=
 =?us-ascii?Q?dPy2hNw7WJTib0woPJTWDDYXY9fY8EyO7sN6tqwDpI5z7KuclKwL2eROi51w?=
 =?us-ascii?Q?FteaLQ+tPd+6y19SEzTo/rtil/yPs869jPM4GsW7/8Sn8N/7fpVw5eeRGlW6?=
 =?us-ascii?Q?7GEoPSBS3TWlv9W3IV8bhkdZXYSuzVh5QMiZngPFh2x/9htmmP9egBJiBEST?=
 =?us-ascii?Q?RE9rOTgG94kmv8CtK4dl7Ssl8tTJ2BSrROpsr3BgJSAp5YFCJSzdH8ffg/i1?=
 =?us-ascii?Q?VzciKpPpBl8JvGTlDdUGAKXDAqmJDw+wIsIveUT5EdMxsPiYzJzeWDsEomru?=
 =?us-ascii?Q?8Idv7mv3yCGt/Vmj1Vv5EOBRGcKh9DtyOZsJZg1zxallMKst0ZMFFQFvacqe?=
 =?us-ascii?Q?iHSl3zHW+hdbefC94JiCAsh4D9dpVX2nR6zOLQT55q2dL9vkMgmIewUjJOjn?=
 =?us-ascii?Q?CFOTzmPmGMY5zRt2yBOBRDi93QL/7WOcc70WXFjKt/45LsHeoEn31Wc06NGl?=
 =?us-ascii?Q?wax7AbuqgMPL4ktnywZsFXg7dE8o1MQpXBFgT2hxyEDmYLNs3SP0i1S/NYI+?=
 =?us-ascii?Q?M+N7CaX+xzuiOtcsgBbSlsH4rkAsdyJmgRMX3skpHxwQyQHG2NzNXigb0e75?=
 =?us-ascii?Q?5Ry+wQOvKf2Bmguy8yck2dlEvN4wj3oLuMXVgwz7DvXnw/wwGUJLI4aaSZVI?=
 =?us-ascii?Q?Lga692XsbijoYKlyGsnUys6bCSdeidbo0p7z+Y5unUltQqv2JYMegBaMlQT6?=
 =?us-ascii?Q?JNeOLja3cRZHEPN2fB/LREnV3qRVijXDRDjAX11I1vNH4LhdX7A9/Eu5s8Mp?=
 =?us-ascii?Q?icE3JT4hcmb439Wk9uW9aW73W/8+8jtcqpMu2o71Z/T34ZFdprRWWVob0wQk?=
 =?us-ascii?Q?lWR5O7z91F7fIC13cz+sM5FsbGfK6n8nE7XxFloaLHg6SYGOzBnaxIy/10RY?=
 =?us-ascii?Q?xjbsRGrMnB8nMDIY8Dq/Lsx6V1Vi0GoG0lH1rLzNMx+cmYasbw1Rbot/d6Yj?=
 =?us-ascii?Q?HwXpYuDdV1s1jhXB/Knw2CfsW+fMAQJf2MEWzAyNZh+ei1cmaI90WdL3RQoi?=
 =?us-ascii?Q?YkpCyHS1YIttWikg+vCNzTDBOKFCQ9YvQ8yM8mqhnJr6BqNcjkt5JBJGvhW1?=
 =?us-ascii?Q?fW+mFhT3vjNygl3S9omXfpOl0X3uLQHvQcBLfd3k5SdVvhpK6JxMSijGVhMY?=
 =?us-ascii?Q?vZOatGirQflXyQzGRdpWCj4gCLwWZrpPoNYYQOat79AAtHjfx2PltgkfNN5/?=
 =?us-ascii?Q?cSZMomgXbns0MU6yYzaQeIo5nAQGnb4i1L2rmuTvH0bNPW9qXK0v+xrdY0la?=
 =?us-ascii?Q?+e3RjzAFRkl9mCudh7+I7PuPZXzy18qeS9kqcQW/29f1llTrZzj3svuGYVj8?=
 =?us-ascii?Q?IJn/mrBCOvZJwVv4HlGuxds6nDiGn/TtsQA0NiA1zWwNo/zKPeAahG6eke39?=
 =?us-ascii?Q?IejUeW62COxAKc2Zo5xqzyhGqPmGVqKP9nutwmxTixXamDvBjQX/PpeMHoQ1?=
 =?us-ascii?Q?tQ+NsM2aosrXRfnYbSahAQr0JIzcN1F6QPBYbbSz?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d746dff5-adf4-4331-1bd0-08db2af6dcc5
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:55.9783
 (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: RU8g0mPqti4noxp9nSPQB0Hjooh+40B+95jx1t/IMrf1d7CeYJUgXSjwJPGzDcsH4tspViaxVh+fb+YCL6FySA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4107
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/ocfs2/filecheck.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/ocfs2/filecheck.c b/fs/ocfs2/filecheck.c
index 1ad7106741f8..fb9cf601245b 100644
--- a/fs/ocfs2/filecheck.c
+++ b/fs/ocfs2/filecheck.c
@@ -198,8 +198,7 @@ void ocfs2_filecheck_remove_sysfs(struct ocfs2_super *osb)
 	if (!osb->osb_fc_ent.fs_fcheck)
 		return;
 
-	kobject_del(&osb->osb_fc_ent.fs_kobj);
-	kobject_put(&osb->osb_fc_ent.fs_kobj);
+	kobject_del_and_put(&osb->osb_fc_ent.fs_kobj);
 	wait_for_completion(&osb->osb_fc_ent.fs_kobj_unregister);
 	ocfs2_filecheck_sysfs_free(&osb->osb_fc_ent);
 }
-- 
2.35.1