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:     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>,
        Damien Le Moal <damien.lemoal@opensource.wdc.com>,
        linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 09/10] nfs: convert to kobject_del_and_put()
Date:   Thu, 23 Mar 2023 00:59:04 +0800
Message-Id: <20230322165905.55389-8-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?d2U7VRH9/9mfqhIyFFmyhdFrU9Rt2yG3Fy23/Bf9P/ADxypSWWlCn3qLg5yr?=
 =?us-ascii?Q?MKLNS+un+yfHE454AFFKk2PCz+j+s4/G01MZRwkLOwaz2RmTTY/fn0KnsiuK?=
 =?us-ascii?Q?zXNwD0vAXczCe/5Dk2Um3zGM5NITZ677DHDvaybjTXIMU/dAe1XniditPJ7T?=
 =?us-ascii?Q?2m6Jjz5h1TmY8K+3KZrq/rNxN4cWPAPmliRHpS8k+uWjYHpfD17VIALDe2QH?=
 =?us-ascii?Q?Jq0DMde0duyJPBMGSWb1YfBkXC+IuGMOpTW8h6jXiz5nDiH/OWNlKliCdo6D?=
 =?us-ascii?Q?OXJZ8plRiflNiIIEgBpGbPYBTWBEMGAhormefFYXC80+dTVGRbjsrJTVGQhL?=
 =?us-ascii?Q?vXDl9+exBPvKPKwH7XMCw50BOpm0WDYnv51S/IaHrxCvEu0qyefHgv+lXqV4?=
 =?us-ascii?Q?EatUUsbluZVXDNsCsl65rRT3L+NJoYnWEuWtLlBknPLHrheV9SCVO0MT+MfH?=
 =?us-ascii?Q?HZZLxzK3V06EzKMvXLRE5NmTraZxjirjJajhjCh3C+8qIQ0z5oCJYVJ48sww?=
 =?us-ascii?Q?eUJ6ahhuHr5ObegJaKNhon3gsoItI/PWBag8RtaeQxukcPZ3jZjm7Yvw+f0c?=
 =?us-ascii?Q?rK6lDxkLgozhvUfeMHD9C0G8lG9tt943Fq8o1NqoyfZba1Jv+4abNXhK+Pgx?=
 =?us-ascii?Q?HH+orJ53ibc7BGNz/LfouNGIbu/j2kY94jFnhAXkSnVTkELe6ksfAbjcyoAp?=
 =?us-ascii?Q?fDzexe88A+1pUvrT8E8Z3X/9l88FO67fKUIlqjVfsjkKLoMZPr66GGWpSAZm?=
 =?us-ascii?Q?tPYDUL2OYDwciUz/Nl80dAudttzAMo2VokDu+gHVgQG62C3Us29DqO5VvCc7?=
 =?us-ascii?Q?ilAD/XeMUX6PyLCxElvOaEw2im6CBjBrei5qwI1Bwmbq4m07S1mfwImAq/D/?=
 =?us-ascii?Q?Lo8N6J4QyMEiHFHNQmq7EcDoNtTpY4ggDdDkGIPU3BEbVbuQ3SmkYWZRP+7q?=
 =?us-ascii?Q?aMQAu3rRVl7Q9UDmTYkZitlnyoRR602kf55l7RSliyMTpS+X0Qy040Sczfcm?=
 =?us-ascii?Q?8BNiMXxBTvKNnF+0ZcfYg9oQFKidfAJmMQZ+vHcUqgWQdDhzIhNUDa2uDoXQ?=
 =?us-ascii?Q?uUs9DmXjfSApAhECffRyBSriz+lBKC5SWTO5344WBJy0OdY3b/oX6xKbuhRm?=
 =?us-ascii?Q?enwNWStTfOwZ13YRlrh4iiBejaBh6wDvr7GmZcpU+MfB4mHfTT+fCP6P+/zM?=
 =?us-ascii?Q?iOs046Y5scML/67zQw16U0n5sIz7oelEhPddoRAvoHcVUGL2+xqSlGNrPUFo?=
 =?us-ascii?Q?hR8rc7TFKUfVUYgUGhKRPGuCSJ1Ny+iF+BNMzrTKzQ6qkRdHeBAom8E37Uuz?=
 =?us-ascii?Q?iXd920e0Uzi5FGI6NByTakd3XCH9nfXvyrF87gGI62H87qh9C3GvdkUM71Df?=
 =?us-ascii?Q?YXB2zWxn4i1hrvH5+kofObzW6yVc/8JiHK8xXlYEizSRITpm63PAsLcHZguv?=
 =?us-ascii?Q?Vil4hsjedVdldYApAw+lTo0yE17RrHguRQxyLiZPsfHFSTKM7VOUDFQFro5i?=
 =?us-ascii?Q?vyDHtoJFGKDBiL1pL4gIXLA4A9MFtx6W2Vf8+2NNI7Xwl5KjpImnehW8ezIp?=
 =?us-ascii?Q?n0LJeGd5qymF8TmyzdgyX8BddaMWMBvrB7xszBzw?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 56c449da-3268-44ce-77a6-08db2af6de5f
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:58.6520
 (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: Q/Zgy33q/qwJM67f6Tk/GqgiTzENqfFkvqoinEcUwzaBZ3VqzgIYUC/0p8tvRiT2inAns1u/YBwu+T1Vn7ddgg==
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/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