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:     "Darrick J. Wong" <djwong@kernel.org>
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-xfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 07/10] xfs: convert to kobject_del_and_put()
Date:   Thu, 23 Mar 2023 00:59:02 +0800
Message-Id: <20230322165905.55389-6-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?u4ZSM5A8Tyt9IzAtaQpqu0z6C13X4yTMYnkVSpJMA4HdtdrKlnXYbT+mYgJf?=
 =?us-ascii?Q?HxLVTR0yOwQK27S/IyUoYIzzepu5dT1PY+ratLW7wSZdCe+pKSOi/U4/ABZ1?=
 =?us-ascii?Q?RDS0VHrn3zMPDz5QPfEXbm5hOxFr8guhmkaOmFub71k0MxIeLhUq0DL8p3jy?=
 =?us-ascii?Q?WiRGB/w4FMN/b8a4EqxrnjIaKQON9oo7vRlAhW/RuILz1b3QQoqJqn8FAk9l?=
 =?us-ascii?Q?sXoEhM5Arn9lRUs7CJfhvvX4FsdiL5j2D28akLOcveYT0inEtS3xRNawdAln?=
 =?us-ascii?Q?FepUsGUpum6n9eVPe+x9VoS6kP6gX3TtcTMuA6DFBn3MggcO4oipHNPWFd+s?=
 =?us-ascii?Q?Hzk4bHjz3pEhW5iRI3p+1/AOU5jZ8xTvh8uiAESvuD8ArydK7/FbMcxBHzhP?=
 =?us-ascii?Q?8B9EYd9yFR5Z33VVdmWH9s7jwHetj3kbgcQkm+ALZpXQgC/BktlqT7UYFYIw?=
 =?us-ascii?Q?208mK+a86yvINTRXJ8QKHul+ZG3gKmispGDWNlWyOLUBt2HVlQ5/Lk6R20JA?=
 =?us-ascii?Q?kIo2LK6XaIOTvmzlsw0GhmmAHqHCQDI1eBkSBiQWyw8knkOOyalL3HhZZkz3?=
 =?us-ascii?Q?0gT+NGz+guhKO5QVcYsinwz2S9lvX42Te2iGRfW+dw5TiD38IkqIzIlNHOOv?=
 =?us-ascii?Q?iDCyNjvUyizgsUjQpYs0hGXt+d4Cy7PWpRCIYp5WI7Psj/PPR5TPb6EDxpjV?=
 =?us-ascii?Q?lFWhT4u7bM/LSCxQkNvTZEBUEv523sr2PRjiD6c1bZBUufFnSrcoDD0NZddi?=
 =?us-ascii?Q?WV1iI9LTbcAx5RaQArc1Jm7X6C9clUoBGSDDNG76BAocR1JiUOBZ8KgB5dm2?=
 =?us-ascii?Q?DsIFrk9dYDrwHG6VSScNssaJ4hM+WDxb4hzaod674OPzU8NSZCDC/h7oJ8ft?=
 =?us-ascii?Q?KE+JYdT6QAJH4cxccAsRnBwMKJo2SSwVmEoNlOegLMxPhjtUdF/OMTOF9hWZ?=
 =?us-ascii?Q?2GaPy4/tt5GIKTA26px0BuexMpvsBoJVoT5eoDEb2bfdYiOls0QFgB79wEhd?=
 =?us-ascii?Q?eKQxJILy4A16vD0ujx9I+iSgJJUdG4acwjXF9S6OePCvbTfmIQcGPENVsqNB?=
 =?us-ascii?Q?p9hxdIlG82+4AQ9g9Xaw9MpBw0h4S8E86i2Vz43Xbb3o+CAh/k5fv+s+JVVy?=
 =?us-ascii?Q?BrR2l8dxCVsgDmMUCdyTHD2Cuj7WPMxXxMzJK4OQEWRe1F8ZYuPjxujfOsAQ?=
 =?us-ascii?Q?P2/vdgf8QkEcATKziXaDUPBiocrpJIa0zmcarpPU4X1DOQNFA5rQRR9xR0CI?=
 =?us-ascii?Q?EzDpu2JgrNeP1Tgv+l3g+hsX/DEsvyUI4VG28W9EgboaJUujLlwpBQXiy7aN?=
 =?us-ascii?Q?iT33qO5x7FUuuWqQ3Enle+xWV4LrY/yyy4e1zrMpq+fV2aq03ZbtU+WncLhl?=
 =?us-ascii?Q?OdH2GxmBV1zxrAuANspe3W8ekoM/5elC5C4/euM7/QAlqhrUQFqfutRWeStz?=
 =?us-ascii?Q?paUgisYk2MOhlmmLxnYjrcVE5fJ5oM7Yx2RcXBLJI17mVDDW6ZmsMK5b85eo?=
 =?us-ascii?Q?PHE4M2D8+X/iRzyt5vNjooW8RqiDT780gS4yvTQMoILD9+B79MTbVjYBVUYp?=
 =?us-ascii?Q?fcBeccophZSCijken9loYzxGDOvzWUFkWLqoE2bf?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6e199792-08c1-4890-65c8-08db2af6db02
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:53.0557
 (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: 0woDf1NxD3GNWu84fo0lVD1uGFExiZTkyUkPO7w1i/u4tuLvYHkf7oq9qRqE69sPlBMJvtegUZGDSlbLXT/Tyw==
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>
Acked-by: Darrick J. Wong <djwong@kernel.org>
---
 fs/xfs/xfs_sysfs.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_sysfs.h b/fs/xfs/xfs_sysfs.h
index 148893ebfdef..e2ff063e2c29 100644
--- a/fs/xfs/xfs_sysfs.h
+++ b/fs/xfs/xfs_sysfs.h
@@ -48,8 +48,7 @@ static inline void
 xfs_sysfs_del(
 	struct xfs_kobj	*kobj)
 {
-	kobject_del(&kobj->kobject);
-	kobject_put(&kobj->kobject);
+	kobject_del_and_put(&kobj->kobject);
 	wait_for_completion(&kobj->complete);
 }
 
-- 
2.35.1