From:   Yangtao Li <frank.li@vivo.com>
To:     Trond Myklebust <trond.myklebust@hammerspace.com>,
        Anna Schumaker <anna@kernel.org>
Cc:     Yangtao Li <frank.li@vivo.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>, linux-nfs@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH v2, RESEND 09/10] nfs: convert to kobject_del_and_put()
Date:   Sun, 19 Mar 2023 17:26:40 +0800
Message-Id: <20230319092641.41917-9-frank.li@vivo.com>
In-Reply-To: <20230319092641.41917-1-frank.li@vivo.com>
References: <20230319092641.41917-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?rMmbAg56LXeB5ddZj45Z9BeGxnHeiTgKKWRovBvEKavC8JzplA0z8KELHTvn?=
 =?us-ascii?Q?/WDaoBH8i53LLJcafUDD1qJu9nHzSKragrMBXiE07QgJ7Ss+zNvthV768e/Z?=
 =?us-ascii?Q?3JYoCnqPYB/7zIT81/dK1om2vfVZPcSu7u8S4tItu/nDAD7SCpiSIhuxEf1s?=
 =?us-ascii?Q?So4Wi0VlAD4TC+X/iSZmPtl5OZI8RPqPkkxO9+lrtRQ09uKObHM11h3vBmdR?=
 =?us-ascii?Q?mVThDpXOJ3TnB6BeIoGwbp0DlBuOnz3f/CoExSq5akC/MFZyQimG65SVcDAJ?=
 =?us-ascii?Q?fSMj/8e5twXun8TDY6FwvMhNaDbggyQ/+CyuaVnDxgaDHJoGd6+M/gnzl/6D?=
 =?us-ascii?Q?7zUbD9vNvG6UxeLmkWQ3kYlh0S40ppoq8H+Fbf/PytyijXGmD2/UGXnKeSZ1?=
 =?us-ascii?Q?8R4/swgSqRhrYIw74Jo0uHzFwLpSw3mw4AYhlY5hv7VU04+2gad5sDlU2olg?=
 =?us-ascii?Q?YCDsdSa9t62l3prIJrH3ZjFLfahjCdlZkBkYYqdDBSwCQlw5FlJFnlVyBQ2w?=
 =?us-ascii?Q?xN2NAC0A0yFNrZCkvXaK0lsECgHCf6/PNVhhi8eAmJga0B4wjV8Ky35NK69t?=
 =?us-ascii?Q?NltC4kjsWRl2JQQDO4JncP3GHb/sJrdxVkVSrpqgqAyB4jJ45atMHXf/Wyv3?=
 =?us-ascii?Q?zc6D8kWdt8BXgT1q2dAVjspuf6RNI/oZI4tcc9SY09vRRw88XK6Kt5qVtosd?=
 =?us-ascii?Q?wKarlA0ZYyjvorlb7iHrPpRWDhIC/n5CKnVx2EDru2BT80Sk8UZppVwObz9i?=
 =?us-ascii?Q?sVg9TiOjYiRjT2SN87Jm2P+UiLqJ/PuLqoR5Fe9hhfntC0pUZdv1vZsbiWHL?=
 =?us-ascii?Q?CAdQVdJbYjkb+/UNtK9nusdddw8cfcbDGq+/SpnEWnBwRUDd/PqfjGVhz+eE?=
 =?us-ascii?Q?n1AwJ/8p+0bfa+OLserYsIBx4UvDxkelQJSr+JubuBmgIih5MLRrHKBllN+v?=
 =?us-ascii?Q?7LADCV2lI549VQhIHSMlRMzFE+NMri0BtB5/YWyl7fP2+l7YjCOBHxPxVTZM?=
 =?us-ascii?Q?yFpIbGbVh7XPPa7yQi5Cumt7Ji1HWlR+I2KbW2I6imtMNtauQxtN7UMwW0pX?=
 =?us-ascii?Q?5RisMiw1gQH+pm+P9tdBAbvB85wi8zF4d1xekduCswCUG8spfZoeI3JaDD1V?=
 =?us-ascii?Q?YpR63bjPMGslP2OnSk6wftw+owOvgs1vla/qnADyx8O9CsFXXTYVWRsI2zdS?=
 =?us-ascii?Q?gaTHPwxFZ8jk1WsucMdZIDQeGQHMCBMg6ctLNfdHfaBndHjpjPh69vO3NtxY?=
 =?us-ascii?Q?vBpVu05I4ayrZGCV75m9pJY2XnARiFqrWDR4pTM/jQY3T6/5Zz0hOWUXwqmb?=
 =?us-ascii?Q?NlEKFY93K6PBtKtAySCD77aY2iXojNYI/CvmMoY9fJV7yhcP3+FdKPIdHM/w?=
 =?us-ascii?Q?eybMu3lNgq9UL+NCRLNJQovFAwsOh7ndCM0jxXZ/+JHGewT2+dHF+sFnUL7q?=
 =?us-ascii?Q?jq4cL9NX0QEf6mFLEzupUOfQ4z400BwsTrvuZ0MvwxKm7RSKAZHGu9baJC6t?=
 =?us-ascii?Q?fCFF2OESPM8QlJffYsIZuH66fnAYVgFVIi4Yr67Ta8hPazrpshKwbWpMIo+k?=
 =?us-ascii?Q?26iRFY8Ff9ue4UJiyKfjbb7UXeXbRr4JMOyEgT3k?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 716614c1-f5f9-47b2-6225-08db285c26dd
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2023 09:27:25.8920
 (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: TqJauQuv7VluhK5Y5zIfoDtdBjyPCuK6eSiLSKq+Eo4XXazUhgWIohgprLlEClG6un0WEJ9V95Nk2oddMMEm9A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4012
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>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/nfs/sysfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c
index 0cbcd2dfa732..a6072be5fa5a 100644
--- a/fs/nfs/sysfs.c
+++ b/fs/nfs/sysfs.c
@@ -185,8 +185,7 @@ void nfs_netns_sysfs_destroy(struct nfs_net *netns)
 
 	if (clp) {
 		kobject_uevent(&clp->kobject, KOBJ_REMOVE);
-		kobject_del(&clp->kobject);
-		kobject_put(&clp->kobject);
+		kobject_del_and_put(&clp->kobject);
 		netns->nfs_client = NULL;
 	}
 }
-- 
2.35.1