From patchwork Wed Mar 22 16:58:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangtao Li X-Patchwork-Id: 13184378 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aib29ajc254.phx1.oracleemaildelivery.com (aib29ajc254.phx1.oracleemaildelivery.com [192.29.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 12FACC7EE2D for ; Wed, 22 Mar 2023 17:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=oss-phx-1109; d=oss.oracle.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=LYjMLUTXT8rIMr7tRs8r6vx0nB3CXUp4tExB31g00vU=; b=HIqoWKydc7PCwgIm93AoRFP72Qw+dfSmatuT7YcmZxLp4BbjAvK2a6056ken5rxtrqSFNHOdHC/s RR2kL54WY0qzMVmYukr1zfl7zn1MZe/osaKotR8/eiZsrxevKIp4XPjgs3i3cJaaFM1EZct2AsbJ 9lk9Uvmi1zNuxJ/CKbgYCBVUyLyl0VFPbRXaKTk/bvBAXEziV74J1hSgdlZoMoc1gZ1R3F2wAu2H KlWHqffrGmLNWfOOjpmsYkFelatGqpyWWRTevtsInKzt1YeHrkL/adiBRXww+e9TE/CEAxJlowMJ kTQYaMsznlrkOujTE0zm1Pp8igXFnDyAs3dL6g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=prod-phx-20191217; d=phx1.rp.oracleemaildelivery.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=LYjMLUTXT8rIMr7tRs8r6vx0nB3CXUp4tExB31g00vU=; b=S2XOlA90g5F5FJ5W0pPQ+Lfcw35THVYSM1j/LakPIlSKQyf6Y2cfSTKKLh05uX1DcBPxQ69OjKvB J1lgstx248WPTvOb9x9H2XJo+SKYSib4a3s8ppadDtjcPcJhVG8qaOlgN3rCuzeNQ6wJae4GVUee GCiTWfBZUZl32K5lNUjU3JVgjGwLNWucsB3zvLGPFgkFni9MxRZvDBCYIHcPZ0xrCA/BBxE1j0fM +y7wj+W3eJehozg49+oiZ+EkRUuuZ6wGa6cCF7muKIf/SxG8ZsNwmOkUWeW3cE1WUlm87PTWPp6o +/BVv84nPRvyfVcMloqqP/Oo3M1cGWqNm1NP/A== Received: by omta-ad3-fd3-301-us-phoenix-1.omtaad3.vcndpphx.oraclevcn.com (Oracle Communications Messaging Server 8.1.0.1.20230214 64bit (built Feb 14 2023)) with ESMTPS id <0RRX0093SM1ACIB0@omta-ad3-fd3-301-us-phoenix-1.omtaad3.vcndpphx.oraclevcn.com> for ocfs2-devel@archiver.kernel.org; Wed, 22 Mar 2023 17:03:10 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JJZSeWLUV7nK0VVISCGbzT7VRosfDS8+/eQWknw0PauuUOt9XdTVNyeLvc+S30WpOOZ4DLBtoIxiwUm7EJHcXx6JwKnkeJ1YpI3u3iHqWohaEpQoIfQ2uTZ6ja+NSCds87FTrdUmJUj50HnbcK4UWNlg3QIdHkFTfuTmNsRHd0q467PWZPhMTQH+DiKJzTT+v0mNTRwWWvLKoI/Au9MNtgvr7twjo88dZChXDaQleP01x2BR3cCrhJbw88+Wqigr7Q0n6IYtoLVJ8LAwVgItq3GtyK5bTeCJ8G3ThHEGmB/Zf4LinmEJybb6UShD3y0v0vQvofBpmVN22KZPhoxtQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JWU/bvQplpq32Knxv8Pox9YEw/v27hnBYemurc1ELJ8=; b=j81VP9v/KD1429vCbHILuNM08XyuVpOyQHzg/mMbAf2+HpXRpFABjSILNqLAZuF7JyxX4GHq2BuSIM250d6w0cecsAR0IASgplvHGwyTdfMKf3FAU0e383SFg3vfaX+fheKZ6aonI4KrZmwojQZiqvUHw+wjOJeiwdXR7cv/grqoSxHlzDhSDxIi8NKD8frwhISFBVjv7tYLMA7xoY3blwPF+wp0UPsAmP7718Odl1ZO4GghSIlZ3ngT0x4Rog9ndCQUCM4012+zVZrC8IHBBQB35vmHGejqYTHmYdpXBZTjcvHPX5/xbvNNaDFRzQNDOjXb3Pn1sLTVmymOPByP3w== ARC-Authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JWU/bvQplpq32Knxv8Pox9YEw/v27hnBYemurc1ELJ8=; b=dLnAJvqv7qCszNP62jfkaIDObQxwd4JQeWVotpDkmRYHtutvGhR96r37/7GlvDxU1dN5nCGic13VoA5T7bHl2LXpydgd5p66WjWYNZkebZAMBi/eK/RhXLC1B29AU4380gVHX7QHqMbZRACmiHqCSE5Yd09lDmMfMNIR9HW0hfb8S+wqHPX+xga55XpXeHTm7b1oNqIhBYZCBEMPYf54vpb7S7zgAn4EgreDxagXs8WORHp89J00hXqSszk6SAznKF/Lli/cmLfZT8hT290PJuhqG8o4+XaC+Md6C/nEh6LaT+GbdigFq0+S/ac1elKAbtcNXxA318kEk2MU7W8vlg== To: clm@fb.com, josef@toxicpanda.com, dsterba@suse.com, xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com, jefflexu@linux.alibaba.com, jaegeuk@kernel.org, trond.myklebust@hammerspace.com, anna@kernel.org, konishi.ryusuke@gmail.com, mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com, richard@nod.at, djwong@kernel.org, damien.lemoal@opensource.wdc.com, naohiro.aota@wdc.com, jth@kernel.org, gregkh@linuxfoundation.org, rafael@kernel.org Date: Thu, 23 Mar 2023 00:58:30 +0800 Message-id: <20230322165830.55071-1-frank.li@vivo.com> X-Mailer: git-send-email 2.35.1 MIME-version: 1.0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SEZPR06MB5269.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(136003)(346002)(396003)(366004)(376002)(451199018)(2616005)(107886003)(6506007)(52116002)(478600001)(6486002)(6666004)(83380400001)(316002)(66476007)(66946007)(66556008)(6512007)(26005)(186003)(8676002)(4326008)(1076003)(8936002)(7416002)(41300700001)(7406005)(5660300002)(2906002)(38100700002)(38350700002)(36756003)(921005)(86362001); DIR:OUT; SFP:1102; X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 16:58:48.2130 (UTC) X-Source-IP: 40.107.117.95 X-Proofpoint-Virus-Version: vendor=nai engine=6500 definitions=10657 signatures=596816 X-Proofpoint-Spam-Details: rule=tap_notspam policy=tap score=0 suspectscore=0 bulkscore=0 impostorscore=0 mlxscore=0 phishscore=0 clxscore=110 lowpriorityscore=0 spamscore=0 mlxlogscore=735 adultscore=0 malwarescore=0 priorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303220119 domainage_hfrom=9115 Cc: linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, Yangtao Li , linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, linux-mtd@lists.infradead.org, ocfs2-devel@oss.oracle.com, linux-fsdevel@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-btrfs@vger.kernel.org Subject: [Ocfs2-devel] [PATCH v3 01/10] kobject: introduce kobject_del_and_put() X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Yangtao Li via Ocfs2-devel Reply-to: Yangtao Li Content-type: text/plain; charset="us-ascii" Content-transfer-encoding: 7bit Errors-to: ocfs2-devel-bounces@oss.oracle.com X-ClientProxiedBy: SI2PR04CA0006.apcprd04.prod.outlook.com (2603:1096:4:197::13) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|SG2PR06MB5238:EE_ X-MS-Office365-Filtering-Correlation-Id: bdf0ab43-7108-4dbe-3a25-08db2af6b457 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9qJOVVxzLZDz0WkTMJRMgXev43UyXmXE57liHybP0/OZw/0HQYplTaY3Psqpr3YmL7Lj6w3yS+r3pZL8da67rpRhHdJDZHXtDYA9RUb6ap7kA3YOrb6a0I/CRFM50S3cOkwLSo2lXPAMU4mzFm88+OGD4fqK6YNAUJGZiufiVewQotc8P0ZXinyxWABRJLyd0jT6krlNwV+W+esDUixAFg7JU1n21I6I/ocMQlcCJ/JFUx5g/TA29eXFkTT391QCyycgKAql+pilxXX8pCHiurx6QkspOSMQJYd0namXkrkLbehwUovYhKwMWaZkNpetQedY22NoheqgxvXIFkpOth4s39Fj+NvKgRP9a6xOHbZF5t4LboYktQ0xf6rW5mqK1uZaJ9D5nmIQ1SDAoa0TE98TJ+UyKIyKV8JLPFtv4vOdVuiBuOilqoPs5YzDTtSBbcVmkK0Rx4OuMNyNFaXwwgQxVnMYaTqgWWZ9HTa7wK0i1my6Dph67nGCnWXMXOVbQyTmpJyfv3QYcQyOjR+sZ9/0apSzKt59dDZOSVbnWvy1swWKRmsfaHj+ZD21SsD+iTQrs9THhjC3WSmjfQ2+42+wYzc0wwI/sglHpPylpvGQPyg7LifIIs9BWDKRJDUPPkr5D2OA1U7GXmPWG0G7EaxDjCjweEa4NKqp7KqKEPvxSgAR841ud3O45Usot2+r051F3Bo9FthzAiBX8qPEvorqiCVXscEGOE72HPVOYbk= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gNhhB9iRDFkitx4TYmdMrIr1teoxZmEMzrX0SYkD/a97ZfOlwCtHvPxP15hVgxC6OKAH535EdkPqvCypdrxHiG/9Kal3m5aXm3SZv2hpN+CEy58v7oN6t+aXRoRl4MjM2Dx77I7/JTWlIPzikCz6diNxQAM/FZCfqBOMUYynViYZeE3UXStkUrDkkH15aSZRL9stEI1SKH3L93ZdnV2BPYqqNDnue6ID3j3p8UZrA4WhZV02iXfizmVYtFQa9a63h11uYa/mOp4VhqJa5OqHrF5whaOFH7VkIgasWw6b+sLaRnTpJEzfjaNj2z6TQMnwXSh6pq8T3qsjR0bXII3xkuHhzyf9kbDK7sBdHswOI2/MjDURS1DnPJ/SwvEbsTM812LXFKIbFhx+p6Y9YhQO82EiXDisyb0aVFlJW3LBSDTa4qZ7CHnlpBSRG57Da2/0M5gVFDl+zTeDO74zKGi83Asg6l9dzO3GxQTXiYzVXdDW1X18e+anJ1hpL7tz+HkFmsX/qUvGu1v+LOdvySfWJnmsLQyaLmarepN5Ahxs1XsoAEtYD7u99g+VCl8W6FszN5r8mBSK3Ej+a/9TFUTdSLjJ4cB5ZQt92RKZfstT6jcQgCNyY+c1blGPQcHonEjsyTDhnHg6aGk8D6j1IxzDw+iZPAoKHdJlGd2xTg/xwj6P+a+8gAPs73IV6EF+A8RXqvDa9U7O3oJ3MdXS0rzr5YnewvkdbLhRbcCjQLT0jZh9srPcgaljx0fPWcgDcGy9UP6eBCh/5TI8mirpBDL+EA/PejA9Hk19Bir/Hpp3UNHZSRnLyjW8tpPeGA4s0T1JKeW3mLjSzd+5DF+YJGAiX/vDFbEE7iCDx8iC0KUrfIEWupZH0A4Mb9t/VN+1gag6vIsSX+eJdTljkBA0SXuKblNnnCWYoLB6umvSUGtmL91ELqeu7hJ3zVdeyrYxT1JMvww6K+J5OvdvJSvlKBOfKNliVWVbYvPg6Jd6MgWCRAw+OsQ43oIIr0TejAwVremaviuvzX6FNq2+qF0ba8otOkpNFSXIuW5cPs4Zg2pafAqDBVKoUALRRVj9hXRdAeX4IQUqma4Rqn3rnM1TGX9y1Qu98tV9Xh6Pnj+oNADfEADliSJZO2QxMcgPgjsyxM49aUSrdSJT7mQEjqtTBuTm9FPxR6YK+uBY1Cfp6RqdNAKDwfyRbhcIGfRsKf2CVKwYKR5xXhiu6vEC8STB0E8pma6xHa2GE+D27z+S1k7SJ4ftzSd86vSvsAZHRw+MbadKR65Vldwi8f3qLZ+CvYqSKtNHHtAM4kduUtzx0vOcHUQhB23TlsPA9WbMOfcNpyVjrtXdOHPf9FmlBsviV+qdAP6NNi204+TQ2upIdLhTMH1snkf2ThGD0YfJ3voU+oVXEyI1ydHnt4Cxb/7tRobk0Bd/hV83n9sZY5yV8Ka0f+dACyBQNr318wcV2VehahfnohpOVr9/C38VFDlv+pYsSjiaJOXlPVkW2Pa5rx7vh6voHbwyr7ttQwyah+bfNgFWqdNfGKlHnkDt6UNnGGOe3iKBcfrAsFwwFAzongLqIrvz/+2eHHWxvjtYnUQo9AEw X-MS-Exchange-CrossTenant-Network-Message-Id: bdf0ab43-7108-4dbe-3a25-08db2af6b457 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal 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: 4D7rdYu7Yq229lsRULEq7gfQJ5DkHyu5VyyEhqw2D+ZJDCFYvuKotVGTwkB104E0drqoLD/pLsipFm8byl/LwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB5238 X-ServerName: mail-tyzapc01on2095.outbound.protection.outlook.com X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:spf.protection.outlook.com -all X-Spam: Clean X-Proofpoint-ORIG-GUID: 7pIubeg4XGAdqA847lJJ1UIuvLHDzxjt X-Proofpoint-GUID: 7pIubeg4XGAdqA847lJJ1UIuvLHDzxjt X-Mailman-Approved-At: Wed, 22 Mar 2023 17:03:04 +0000 Reporting-Meta: AAE2dT0ZX1zd407aqWI1lnvwSVZ3VjMs4qcH1w7Sf5JzNw+OuR/9i2AJ21WsZSyL 8IgWxJylV15tUSNgIcS9msncHMB/7ClktXF/jtkhqCkEB2/zSG6NdembWIeAYbcr +PDFccOuaCge/YIM7mk/DYZR4xMryEhhb2g6w8vx0GUf6U2QEXAGWNEihuDi0Jwc DiCYwQYtVyDDiglUtzEnqqoZpnPJcA6R5Fy5WkjyQcfv5yrHS44QR5KktU1Q/SGb 3uRuL3T17TTRLSrDHn7x3lkuMFgK+z21+yc2cJXxQ2GyRbdSgDYed2SUEjNEmxTm 5b/U1qKDmuu3aOG5C6fchFB2Poujuxj4552pAc+B3TGiHPXtfTgsUFsIsDDeSDj2 WGvoNniMIJqtp0oT+V/jV1Z8OtdWwxNRefslijp+LsUzaDRQt33kgQxnpKik8agS 6zld89zPNI/IJPTnyWw4xpOAe8d05ERzaP5yU2PzcDNFEhf+n9VpUJn+tBpHFXgZ tSDPXagua3pmc4P0F1iXbhJ6eClLNOVbZ4jsKy4SGwGK7Q== There are plenty of using kobject_del() and kobject_put() together in the kernel tree. This patch wraps these two calls in a single helper. Signed-off-by: Yangtao Li Reviewed-by: Damien Le Moal --- v3: -convert to inline helper v2: -add kobject_del_and_put() users include/linux/kobject.h | 13 +++++++++++++ lib/kobject.c | 3 +-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/linux/kobject.h b/include/linux/kobject.h index bdab370a24f4..e21b7c22e355 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -112,6 +112,19 @@ extern struct kobject * __must_check kobject_get_unless_zero( struct kobject *kobj); extern void kobject_put(struct kobject *kobj); +/** + * kobject_del_and_put() - Delete kobject. + * @kobj: object. + * + * Unlink kobject from hierarchy and decrement the refcount. + * If refcount is 0, call kobject_cleanup(). + */ +static inline void kobject_del_and_put(struct kobject *kobj) +{ + kobject_del(kobj); + kobject_put(kobj); +} + extern const void *kobject_namespace(const struct kobject *kobj); extern void kobject_get_ownership(const struct kobject *kobj, kuid_t *uid, kgid_t *gid); diff --git a/lib/kobject.c b/lib/kobject.c index f79a434e1231..e6c5a3ff1c53 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -876,8 +876,7 @@ void kset_unregister(struct kset *k) { if (!k) return; - kobject_del(&k->kobj); - kobject_put(&k->kobj); + kobject_del_and_put(&k->kobj); } EXPORT_SYMBOL(kset_unregister); From patchwork Wed Mar 22 16:59:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangtao Li X-Patchwork-Id: 13184379 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aib29ajc244.phx1.oracleemaildelivery.com (aib29ajc244.phx1.oracleemaildelivery.com [192.29.103.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5A1C4C77B6F for ; Wed, 22 Mar 2023 17:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=oss-phx-1109; d=oss.oracle.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=U+W8xZKoR9T3+NWnSLTT0vXbyQ5EA9g3OvJLWcNfkx8=; b=tOt/EAJBxmC3Lo29YO7RVZD/95fOVvTbGKhzBW0OD6+i8+UdrGgtIO16v0+PuBNJ7bW5LpTXa16h i7RCr8yM551sGxxZXAXV2HmDhE52wrvhtRcvyvcCluvAf3zCoGXidqkL8AC81PyUOhsi+589Ih6G 9ZW/jo64wREdGx2YCEBIdpokjBR8sLf+dYV1nnzmt+P+7IFfGjrg6MIeiJ00cNiMnhhnIc9Bt1Mb 5iH54NEVSIlnUNRaePVLGsOiIImeIVdrb2gMxVmzmX4E5enP2/abUiXgfKWekkjSQtaVXLZ3QMzz 7/IDXNVy8xUWDdtT+a0ffvnEEP8NHhPM9xOvUQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=prod-phx-20191217; d=phx1.rp.oracleemaildelivery.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=U+W8xZKoR9T3+NWnSLTT0vXbyQ5EA9g3OvJLWcNfkx8=; b=npwnYSZ0otiyfmiBXHISEUYFaqi8uKO5rXMUcI1VhdAJxrov7EFB6mE48Fizxwf+hK3uY+UYBANQ EE/BLG+VuPTfsSShgIRnR08hM5IMUyHMYvOTKG+WUXNom7/Oee/tYDLN5vYzx5yU2rB24UCYroQ4 XN0qoBrQPP11PlaHxsecMTA2SPoXtgcegv+X5hdy6Ya41dEssgdxizUmG5xjlxf1abwFAcbN4ldK AlEd8v0htrsWXrLgPECIErYEUT4bc6d7ccUGtnOsTB7sFkF99SIZFOQqJYdbMB8JqKHdNXtik/E6 PxQDjmPo+mMtt88xQInPgCKu91OAlBTAXT0T5Q== Received: by omta-ad1-fd1-101-us-phoenix-1.omtaad1.vcndpphx.oraclevcn.com (Oracle Communications Messaging Server 8.1.0.1.20230214 64bit (built Feb 14 2023)) with ESMTPS id <0RRX00FU7M1EUM20@omta-ad1-fd1-101-us-phoenix-1.omtaad1.vcndpphx.oraclevcn.com> for ocfs2-devel@archiver.kernel.org; Wed, 22 Mar 2023 17:03:14 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EsMaX2Ln0gYXXnjF0ga8gs+GXleJJK4l0WAIaoA4t0U3ifLGRnY4O4phXxKDgkBuPBtTRnAqWiuBQL8yIyU/fqjDdd8obOvcef87CYTXYmyxvg6yYBt4q9P5VJMWDAn1R9X1DvD5Ame2A4RAqlVDz7S0NO8y2XdBA5TLJnK0ZjvvvxAVawp/uRNyp3bp8trCR7r2DKzKh8hDEmXrgLr8pUjXRC/hyo72YepqTVGPs2jkuVG7wi7XRElc1Yoetx89R1/2eqEdLGoHC470Sh44yfmCw15aQqjv6zcKmzAfwFgkhY9IRqh2kKSeJWBNSsUwRhsNulCU3ksdNh9DhNJw2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pNtRww3+WurnR/ssb+TOIf0NNF1vkQf8qeCiNRBrFJo=; b=k/SYhU3gLi0qHoKU1TXGJnvg7/nSZ24jc5nEzXCVmfZ0chm16oKfAC0c7wKrEwvPHvOuSfCum7S5A5Y37aLV9x2abNEKKORLm14IfurjrgPUYTW+n8ElYdF4zydKPT/HUrTiDaf0R/xGhnWzVzd0JE7cPwTam6844KdEb6vEfOsAFVTYxD/q1IRwfV7iRNWe5eeKF2VyAg+tbiUlr/54VXZzaSMC70OdJCw8hB25+RYvY5xnEuy1vwh6++qKJXruuZ0YaW/JI9BwJUkeqExsw0VD0oQp48QR+6HgPsO1LWfmim0yggUUymfbLGm2yFI+P80cgQ+ko/t6uLs59DinWg== ARC-Authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pNtRww3+WurnR/ssb+TOIf0NNF1vkQf8qeCiNRBrFJo=; b=XE3ghHas5VmID4ddZIi6bW7Z7mU5WN/ugus7njcwadlqp4TRads8EjFFplE+aO0mhfeenX1jyQOgTs5CZZkP27s5lhBPDnumPYMlcsjOPLpyy2++7KQeCzYOJtA4VaWp2NkKRWPIwS3DwLbW1T83RL5/7q4sQks0g9hiAgLxqNwQAupwa3php+iTpnDYvUOTELF+auI9GtNSDLkPhHiBRWuHs3odl6WpmELt/Wgx6v2p49nS8jiBZAz3+Wb3FzSB333EhxSszOJ9BU3liZDu52+raLyLpVHgO9U6+9ahNwMkybVEtTCpEzThoFIfANHeS5U1GYqKO0+zK4bTByaW2Q== To: Mark Fasheh , Joel Becker , Joseph Qi Date: Thu, 23 Mar 2023 00:59:03 +0800 Message-id: <20230322165905.55389-7-frank.li@vivo.com> X-Mailer: git-send-email 2.35.1 In-reply-to: <20230322165905.55389-1-frank.li@vivo.com> References: <20230322165905.55389-1-frank.li@vivo.com> MIME-version: 1.0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SEZPR06MB5269.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(396003)(136003)(376002)(366004)(346002)(39860400002)(451199018)(6512007)(2616005)(6666004)(1076003)(52116002)(26005)(478600001)(5660300002)(186003)(6506007)(6486002)(83380400001)(316002)(110136005)(38350700002)(38100700002)(86362001)(8676002)(66946007)(4744005)(54906003)(41300700001)(36756003)(8936002)(66476007)(66556008)(2906002)(4326008); DIR:OUT; SFP:1102; X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 16:59:55.9783 (UTC) X-Source-IP: 40.107.215.108 X-Proofpoint-Virus-Version: vendor=nai engine=6500 definitions=10657 signatures=596816 X-Proofpoint-Spam-Details: rule=tap_notspam policy=tap score=0 suspectscore=0 bulkscore=0 mlxlogscore=955 priorityscore=95 malwarescore=0 adultscore=0 mlxscore=0 clxscore=102 phishscore=0 lowpriorityscore=0 spamscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303220120 domainage_hfrom=9115 Cc: "Rafael J. Wysocki" , Greg Kroah-Hartman , Damien Le Moal , Yangtao Li , linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH v3 08/10] ocfs2: convert to kobject_del_and_put() X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Yangtao Li via Ocfs2-devel Reply-to: Yangtao Li Content-type: text/plain; charset="us-ascii" Content-transfer-encoding: 7bit Errors-to: ocfs2-devel-bounces@oss.oracle.com X-ClientProxiedBy: SI1PR02CA0012.apcprd02.prod.outlook.com (2603:1096:4:1f7::8) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|SI2PR06MB4107:EE_ X-MS-Office365-Filtering-Correlation-Id: d746dff5-adf4-4331-1bd0-08db2af6dcc5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pkDIC8842PqoQRUBIHYym9rii+8ZFNM7C7EYGZCPuyEDSdmNs6huNFAyw9v7yGp5Z34ImpDdWTGHkDyH5uQRUZu16SRMLxPk/sby3FicdG3ebwSAeiQTl8MMMwzi63jgKcaEEjMubbsv264JGSVUVFB21gQQWyL/p82wGGx7TeaPXf6G41Zzb3MUKQIw0GAQPejcxgVhTBT/LksgzSk72IxstEaBeVcsUpkgRsr4/DDxhErNPHzMOC5SCdYgQBrYttUX3vtfQMxODYbX7lkzX6dolycIX1XL/2xE+RH264KTDIrxtztTLbwJfkW+ukyUkbHqpSTRtNX0rZBglq22b0y5C85MLzGzmdGHGiY9CcJR7vLg8moHQKnrEOsZ46RdzxYZdb3fBMH5i8uPS1j7d3Yuy0wtmbCzc6Z8/IJ4EdnEThZMTRd5++Fnz7otGnU7GK2ORZFIYzG3d+vZ2fIbrCdQXKYmXT9s2qvD3kOR93H+EE6JroLl9oq97pgSGcp/yJVxH7ZP+8UNr/y57LTiyTDEpb6o1m1b9VyucRh5E6xFyWpehhSB4zQmgx8PvWSkpTe2DgyhE553osckoUnFuvAMrfGG7G/FOw4P3lXabUceWi6q4J70LQTR6C8920MxPAJyKaAe5zbXuvlyDIfiQC9bEQQAU5FyxqUkE4ZKp0+5pPcYug/muJa055hb2GfJ50jah7vAtuLlyA+D7qWFag== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: l1+S78XpM+CouZwXt1Rk4latGQCVLb076NKHd2zuNPYX1hdzVsV/ZWJHVZZ+FF4UnA+okT9atxx0BDVVrwnSxh+X6SvJm0GSarID8qfoev9QUn+jVZJBSfxTdPy2hNw7WJTib0woPJTWDDYXY9fY8EyO7sN6tqwDpI5z7KuclKwL2eROi51wFteaLQ+tPd+6y19SEzTo/rtil/yPs869jPM4GsW7/8Sn8N/7fpVw5eeRGlW67GEoPSBS3TWlv9W3IV8bhkdZXYSuzVh5QMiZngPFh2x/9htmmP9egBJiBESTRE9rOTgG94kmv8CtK4dl7Ssl8tTJ2BSrROpsr3BgJSAp5YFCJSzdH8ffg/i1VzciKpPpBl8JvGTlDdUGAKXDAqmJDw+wIsIveUT5EdMxsPiYzJzeWDsEomru8Idv7mv3yCGt/Vmj1Vv5EOBRGcKh9DtyOZsJZg1zxallMKst0ZMFFQFvacqeiHSl3zHW+hdbefC94JiCAsh4D9dpVX2nR6zOLQT55q2dL9vkMgmIewUjJOjnCFOTzmPmGMY5zRt2yBOBRDi93QL/7WOcc70WXFjKt/45LsHeoEn31Wc06NGlwax7AbuqgMPL4ktnywZsFXg7dE8o1MQpXBFgT2hxyEDmYLNs3SP0i1S/NYI+M+N7CaX+xzuiOtcsgBbSlsH4rkAsdyJmgRMX3skpHxwQyQHG2NzNXigb0e755Ry+wQOvKf2Bmguy8yck2dlEvN4wj3oLuMXVgwz7DvXnw/wwGUJLI4aaSZVILga692XsbijoYKlyGsnUys6bCSdeidbo0p7z+Y5unUltQqv2JYMegBaMlQT6JNeOLja3cRZHEPN2fB/LREnV3qRVijXDRDjAX11I1vNH4LhdX7A9/Eu5s8MpicE3JT4hcmb439Wk9uW9aW73W/8+8jtcqpMu2o71Z/T34ZFdprRWWVob0wQklWR5O7z91F7fIC13cz+sM5FsbGfK6n8nE7XxFloaLHg6SYGOzBnaxIy/10RYxjbsRGrMnB8nMDIY8Dq/Lsx6V1Vi0GoG0lH1rLzNMx+cmYasbw1Rbot/d6YjHwXpYuDdV1s1jhXB/Knw2CfsW+fMAQJf2MEWzAyNZh+ei1cmaI90WdL3RQoiYkpCyHS1YIttWikg+vCNzTDBOKFCQ9YvQ8yM8mqhnJr6BqNcjkt5JBJGvhW1fW+mFhT3vjNygl3S9omXfpOl0X3uLQHvQcBLfd3k5SdVvhpK6JxMSijGVhMYvZOatGirQflXyQzGRdpWCj4gCLwWZrpPoNYYQOat79AAtHjfx2PltgkfNN5/cSZMomgXbns0MU6yYzaQeIo5nAQGnb4i1L2rmuTvH0bNPW9qXK0v+xrdY0la+e3RjzAFRkl9mCudh7+I7PuPZXzy18qeS9kqcQW/29f1llTrZzj3svuGYVj8IJn/mrBCOvZJwVv4HlGuxds6nDiGn/TtsQA0NiA1zWwNo/zKPeAahG6eke39IejUeW62COxAKc2Zo5xqzyhGqPmGVqKP9nutwmxTixXamDvBjQX/PpeMHoQ1tQ+NsM2aosrXRfnYbSahAQr0JIzcN1F6QPBYbbSz 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-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-ServerName: mail-sgaapc01on2108.outbound.protection.outlook.com X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:spf.protection.outlook.com -all X-Spam: Clean X-Proofpoint-ORIG-GUID: 5TlbDRYyC287Jq-KDDa4_TYp-aRFqMbS X-Proofpoint-GUID: 5TlbDRYyC287Jq-KDDa4_TYp-aRFqMbS X-Mailman-Approved-At: Wed, 22 Mar 2023 17:03:04 +0000 Reporting-Meta: AAHbNiVlChj0eP6H8muTnMrV0bcQiT57E1/IotkXOmcRfj4BpCEH35zqCrIckFc3 kCTNhY2mSVSKkFVy8w+oxM7y++DuInAXcxZSVDi45u+6xzAi39jcLcZ3JRaPnmW/ TkxMeXxsuNSuVecmgiEceIc04s6YVwaUOhQ0pzz3674uZCYRwmJeBGpWnTcyjle9 4wZBw0yhk/DJgP8s+uIhZPKfM0x4IHYKKD891YAEN16ncqG7brhnF4X/xmNUcdaJ 8+N59e2fuSHU/pt5czyxZu48unL0S3T/jqgiLDnlTZXbeAvMY9pn6Wgf7kjB5ssv jsC1iKH8zgT5LFlQxk/cDcERbGjI9P84DAQgN4D5cPWgJsn0apMkxAjqYGsDHZkg Ydads/5kaVbxP56FatQdlFi381Bft9Te3CD1pUqfZnM/UL1s4EhC91UkJ90JD69y LWpMWwNYLImGGgcD8Kgb6UU9u/4JCqul3AZ/p3S7XP4BetyI3swtvjd0kQ8WDq/H 9e16/S5W/3mRJ/RpmcPavCvpOXnt2sO2r5rj3jx4uEZQ Use kobject_del_and_put() to simplify code. Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: Damien Le Moal Signed-off-by: Yangtao Li Reviewed-by: Damien Le Moal --- 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); }