From patchwork Thu Nov 24 06:40:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yuezhang.Mo@sony.com" X-Patchwork-Id: 13054618 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00488C4332F for ; Thu, 24 Nov 2022 06:41:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229811AbiKXGll (ORCPT ); Thu, 24 Nov 2022 01:41:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229750AbiKXGle (ORCPT ); Thu, 24 Nov 2022 01:41:34 -0500 Received: from mx07-001d1705.pphosted.com (mx07-001d1705.pphosted.com [185.132.183.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49C63E14E6; Wed, 23 Nov 2022 22:41:04 -0800 (PST) Received: from pps.filterd (m0209326.ppops.net [127.0.0.1]) by mx08-001d1705.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AO6WRUH002142; Thu, 24 Nov 2022 06:40:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sony.com; h=from : to : cc : subject : date : message-id : content-type : content-transfer-encoding : mime-version; s=S1; bh=xKKeZR6+SXGUXOimF0GeERuS7BNE4wQS3IqZd9D2IJ8=; b=p+6bY9cLsuAK27uPAhoagIkDthV5QdkTr/3G+e9zZD8gwt54cdrWmP0bc+7X328tB/P7 cPyP7ctoV7QAhst9zQ7u2R9Vg+OWIYaXQ2lTmgNvYHcZdcASeoRg1KegqkilhChX8Ddg iCBGrwz+U3NJ4di8UefBQ/8aTQaaPeLvNRLKK3IwQIbb8r/iPIaF69sBNG5OqYaQx2JZ TzHvgy4UMxc97Y1sKfWo2T8nyIAFyAUgH58BlQggj2mrZa6Y9VqYgrTsU+TV35h6d+J3 lDp87zRQfEkfHNcR9mP9cwtTUCxuSsK/YM/Xy4KDpuWDX3waESdmcD3/uuVeInZRw7k9 xA== Received: from apc01-tyz-obe.outbound.protection.outlook.com (mail-tyzapc01lp2042.outbound.protection.outlook.com [104.47.110.42]) by mx08-001d1705.pphosted.com (PPS) with ESMTPS id 3kxrd5mtxk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 24 Nov 2022 06:40:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fszdXAvc8b/a2/p/hsDHTvE3JgZ/kZoVQvBB66JpuxasbhpOgQiccdmEATWJ4IPQCIlFmEoIFIGTv10bGrq3ssa36QE+YixbUmdF41BRcKY1k7sC9KNa9P4TxGhwQctrB8/1Sh30OZTPeEYdGyTHVaouy84IoujOy55Evl5kB+nbcBSJztTyVV4Z4kizHyEGObc85zWFwASfmuu73c30yCXAGw1EFsse84+I7sItUmWZe96LJN6pCvspRnAKJ/ao6mx6jELLmC0vK9erhn3FZCk/mdVVatTHjZACe8KW97A9nHaLqyItypj8XOkT0ovMRnyL9+Wzgip3lemIQsuvXw== 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=xKKeZR6+SXGUXOimF0GeERuS7BNE4wQS3IqZd9D2IJ8=; b=PR5CfzZ4PhbFL4RJ2HA0rn/KLfVFBf+KbBiTv8ozOfsA50wmDX7rwy0wmgo0tZGkO2lzPjiwbOBF4nH0ao6LyjuNy8csr9f88lEYO5JeB37Z8mIoZMYBxolh7KBw9egYl87MckQ664egY0H+bAT1AFk2vnGHkNMzvX1opSySECA+OcBkkcDl8aGJHJVmIP7VOcG0+m674fkHlNO4AMLzY9dGXX8YOZ0/RYehBjgIXOaiF7Ww9czbsHCil2LRFxR6BmHhDHjXWgmDFRTaEPBkORqFWAxV7JwbQwnjooLXR9OFvZPj2xeXBnR/G8I3T4/aIwuG74f2h6awSD2FHX4wKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=sony.com; dmarc=pass action=none header.from=sony.com; dkim=pass header.d=sony.com; arc=none Received: from PUZPR04MB6316.apcprd04.prod.outlook.com (2603:1096:301:fc::7) by SI2PR04MB4425.apcprd04.prod.outlook.com (2603:1096:4:e8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.17; Thu, 24 Nov 2022 06:40:40 +0000 Received: from PUZPR04MB6316.apcprd04.prod.outlook.com ([fe80::708b:1447:3c12:c222]) by PUZPR04MB6316.apcprd04.prod.outlook.com ([fe80::708b:1447:3c12:c222%8]) with mapi id 15.20.5857.008; Thu, 24 Nov 2022 06:40:40 +0000 From: "Yuezhang.Mo@sony.com" To: "linkinjeon@kernel.org" , "sj1557.seo@samsung.com" CC: "linux-fsdevel@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Andy.Wu@sony.com" , "Wataru.Aoyama@sony.com" Subject: [PATCH v2 4/5] exfat: rename exfat_free_dentry_set() to exfat_put_dentry_set() Thread-Topic: [PATCH v2 4/5] exfat: rename exfat_free_dentry_set() to exfat_put_dentry_set() Thread-Index: Adj/zhk3xAnUZqh9RdCn2jEE9Dr+8w== Date: Thu, 24 Nov 2022 06:40:40 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PUZPR04MB6316:EE_|SI2PR04MB4425:EE_ x-ms-office365-filtering-correlation-id: dbea7db0-c004-4aca-ba01-08dacde6cd96 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5SgMZfZR5mvN7U7ghU2GyB7f6VbvoUHQdiXQCLMkDv/iZfdbwX8lVdKicXNBPqJ/0lLeqCDscQWXqKz9G4cSNfLTjC4xb0pB7M3NvfV5iagkchTdWleBlVc743fZecoobvnmxL0mMjlim7x00+LBGuzfThL9krMqvmPAIN6xKvnBOPsKuv9Cc1OSaVDKxNbocVAG6TvhBAohMuYUIi2rMK1TfMa3tUJWUh9OVoaDC5lUne7fR7FoemKCTSLrctSZSpNpVW5t8mfqpSY0praZphaPw0F0ILdxwUHXEXkByOviZr1OhEzZUzjzWE4rBv4bAxST3qaZQP4MZXcVWxS6DXTO8SnnWYy31J2LOc/AtfFJ61JzesnexVjn7SVIqhu7V/wCmyErbnKpiM6OGeVDkIHZoqthY/W7+HMuAvbTTImXTwoLNzza5jqT9uoIdu5Of4qH9hNf0dSy0ByXH4JDw6ReaImxKbCeP6ASI3a3T5R6JxMh6Rafis1qRJMg768eujWZ95TUkKNXNjbRNTj9jrVKtsmaHzUzWRFhCp61u3sCaN6pkXN5TcBHPut4JyGZPVmSwTHBAbbgvLPnTSvnjjwa+lPVXJrDCIzQ67VjTIxQmD6rMfsCq96ZfOLWbw+wteqMbs9dQsvjCKEYy7KfiHKbvvI2qCCZao6YmTh8Z0DLOubDAEr1aE/weGY0v1Iiabg18TZOlmUDBNzeINxmXg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PUZPR04MB6316.apcprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(396003)(366004)(376002)(136003)(346002)(451199015)(41300700001)(8936002)(478600001)(54906003)(4326008)(5660300002)(316002)(66556008)(66476007)(66946007)(76116006)(52536014)(66446008)(64756008)(8676002)(71200400001)(107886003)(2906002)(7696005)(6506007)(9686003)(186003)(110136005)(122000001)(26005)(38070700005)(38100700002)(82960400001)(86362001)(83380400001)(33656002)(55016003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?LH2cXk20skcyjC8ZVpxP5sGa+3cE?= =?utf-8?q?JYTzDRix5Kh8LZ4peKUT0wmiZYsSPOUkWPNS+faLEx4QqEO7bowCq9S7GRl8HUm2u?= =?utf-8?q?7DX0SyQ/Nb0oeA8dlqOwQBCy5jMelqjOCvzN10L2GZvvEnpVJQ44HK9cuCBfrBclZ?= =?utf-8?q?vcLTDBWy9gZ+ow5ypNGzv55B2NASWTmq+EuaH/JiDQLM+UuDot9rTCaRXt9II9XOU?= =?utf-8?q?icQ6rjnxBDFgMRU/q+iA6VXEEbyzyjuvZrNev7LO0pMN6eB99Fsf6x4bEIgrLm36U?= =?utf-8?q?mVVYL8mHw5nhuknk7EL4Jio/YAKXfXzqN+HL+V2/nSwHgBriAFQ+f3OhFzPVLu62f?= =?utf-8?q?o2rIN1CTSfBMavDM+2NLomM69N3vonUdZZIPiiQR7DepOdraf+3UtHxVvPJDVLGjC?= =?utf-8?q?TNZxUOVvGqzlj9WuRbaA4L8+6G0Ti23XFLVZXdXc4zZV0FV+MHTDsRkVar0Q4Zopa?= =?utf-8?q?Hz+9uWAcUfO01gG23nhAX/D/VTmB1/NyS6O1zB5nJNb63CKVPjSZEjYqUnJx8yPN+?= =?utf-8?q?BbicaFXkUq1tsw9PWiwE9d4L1C3w6ZRTSXvn6V4Ue5nQPHZoQbsvoYDoQ2K4ncHeB?= =?utf-8?q?GP973NsLs95b1sNVOjJx9e0sIov2aXJ0b9R8V8Ljf6adtduikrzoHAy7a8s1+maoN?= =?utf-8?q?wga97Cbw4Snw+4gBzQhy2DczwQ6JQBuMGYzEuhLLxFNzcf50kAd0dJ0KH5fJC2hmy?= =?utf-8?q?4Hi1QaYQtmEV6XMHuS7QVhxiDkjRsNAoScnkKaCLBKuQMW6SOgAj3hbj1jOFloLs3?= =?utf-8?q?+lNoqFyU4Xt9CMSTr7GVYkyi+T766WY6YP25orPh5IpOIJRP/xnwcpcdFiLddfwG2?= =?utf-8?q?1K/u6+BXZV5auFTdPaCmZkVoZsDAEOG4EltHLpbJBPvN/z+IZdsmDLpGmLBfjHctd?= =?utf-8?q?N7AAU4JMKT7l27D12q42FFY1lNmVnZrwJm4yx+sxCCjuuu//2G1s1Rx4xSNKwYgGM?= =?utf-8?q?sUmw1ynd5CBXpT+Y4iVMAToZ8ww4JL0+1qzTzVIU/INsvR9kn/1+79MGOjlIS5ETW?= =?utf-8?q?tEV0naesy5/FPLIBIbMTUFlSA0w/3W3Bz96UR0jxgU6nbmgLTiMs1VJzvJ871GAVG?= =?utf-8?q?GoDxdpnJ+qe8Ijs3isQhZrfBFD4zRqZtT5ahYR55vfbbhaNrqrc1rPK0w3+Tq6hhQ?= =?utf-8?q?NgZrvIjw4QcB7dM5Lt+gXIlkboF2xMpxBCMGaF0u+jGQiTSmdJC3HdSe0NTdARCBa?= =?utf-8?q?HzfFELnv8xqa2laG/PwIAsw9JON1ZKD8yfG0DR5t3bTFsW0DvnQsrVRvTTlVbFaDz?= =?utf-8?q?iNjRY1nNKLtLYjR3E5Uw4QQoXe6CFZBlpuObHi9SAGUMX99mw3SK26pAArYA/x9Lp?= =?utf-8?q?0oRFtgCt7jAOLs4fbX43KpO+z3dzZPY5brpPDTtv5tLOHPr8mKPVa045VhKqWLkQa?= =?utf-8?q?/0AdLIp5NDrHdAOXul9jMRB0m0mVZTCEFCMz2fwRhnB/0W+snPGA+4fi59mEkGGoM?= =?utf-8?q?+P/dzSB5jLNjSF6imY1rIwW0MWwlP6WMk41q7HZymadhX4wPJk06f+qPY6iOShVG1?= =?utf-8?q?IqBQjbi2ZOTA?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 3Gj2Xju+4iJNP5D5F4viA8bfOCMFr+7bK95Uk51BWNs+vhiWXQ0brkR0qZS1gAOa41QuWQ2FMY+0jV9B2dOTKxml9XoEZkqlgFt8GuHZYUTbb0MQC/zYRo3/NqBg1SG5kVUr8GFXd8cvRQgGYE/z+LQANcR6hQ2n1QznBfPwE5S2mjC3Fn6Zhrnr7kHxQtneGsC98YzD7IKL3tzmEIg+Abyi7oZbJ0MdqaGo+XEfEN+B8/k+K3eiIPrTxokIJEtlptUpcYgAcUQyy2zKX7JwWd6Vp4nLL4AjDxV0AQ2Xn6yVMdfAJydLh4PFmh7n9zjC2TPrxZoTe72y7Yvh6nHbQRvlXFAL3CIh+2WsEyDBsH6ppwxmf7ZCdppeiJ392fWBThN3hMQ/psv0qPK50u8zr3QTQea59SItgTB2MIt7D5pjNwaT/LDqBXIrRXD+Ub6yC24q0FiVRR50fgbBKRrUtbG/f07nBHopvZRR5Gr/zr66h9PSZjc86Rf7gjvEEgOS3E+JK34YxwPKTEkURDZNvjE+1JQvOprKJMZx3iNDE3OoR5jHZt7ZqHGKaeBW30hm4exde0DRKZ/QVDwB617OhwX2feQ0abMaT+BQXUBkqwudTwpVKUmgevncSYjVlc3r++uT+vfMcQAXTYCj0Ims5f79AS8gAlUrNeEop+XHpH9noTEIV+/lM8mzgsKrjfszOQj187fpzdu0PyLhrFs3017SPAtHtasja6CdDzSqAYQc/GbRROn9vB9B6h2ZpKWDjUZHMLrxye/ZCVaamZ+vn7i0+xAT0g7cUr/C/6lPFVLLcnRGbK9uBFJMPQAx4vQCGwIT8FfXknrUgsm74CDMUTxxhvyRw53RPJksFx+j98UEfGPhdiIb6QFAGYv6llxO X-OriginatorOrg: sony.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PUZPR04MB6316.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbea7db0-c004-4aca-ba01-08dacde6cd96 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Nov 2022 06:40:40.1101 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 66c65d8a-9158-4521-a2d8-664963db48e4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: vRZQJx1mwaPjRVai3kn/Ck4v0llp3kQ6qPElqCSAYAoIcpEpD57+QAo7xrITQppmrt0/ZCJV5nuNwWAA694bMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR04MB4425 X-Proofpoint-GUID: PpyTMHDIQlcsQcAQ0utRvtNjeZqFq74W X-Proofpoint-ORIG-GUID: PpyTMHDIQlcsQcAQ0utRvtNjeZqFq74W X-Sony-Outbound-GUID: PpyTMHDIQlcsQcAQ0utRvtNjeZqFq74W X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-24_04,2022-11-23_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Since struct exfat_entry_set_cache is allocated from stack, no need to free, so rename exfat_free_dentry_set() to exfat_put_dentry_set(). After renaming, the new function pair is exfat_get_dentry_set()/exfat_put_dentry_set(). Signed-off-by: Yuezhang Mo Reviewed-by: Andy Wu Reviewed-by: Aoyama Wataru --- fs/exfat/dir.c | 16 ++++++++-------- fs/exfat/exfat_fs.h | 2 +- fs/exfat/inode.c | 2 +- fs/exfat/namei.c | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fs/exfat/dir.c b/fs/exfat/dir.c index a3fb609dd129..a9a0b3e46af2 100644 --- a/fs/exfat/dir.c +++ b/fs/exfat/dir.c @@ -55,7 +55,7 @@ static void exfat_get_uniname_from_ext_entry(struct super_block *sb, uniname += EXFAT_FILE_NAME_LEN; } - exfat_free_dentry_set(&es, false); + exfat_put_dentry_set(&es, false); } /* read a directory entry from the opened directory */ @@ -602,7 +602,7 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es) es->modified = true; } -int exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync) +int exfat_put_dentry_set(struct exfat_entry_set_cache *es, int sync) { int i, err = 0; @@ -860,7 +860,7 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, ep = exfat_get_dentry_cached(es, 0); if (!exfat_validate_entry(exfat_get_entry_type(ep), &mode)) - goto free_es; + goto put_es; num_entries = type == ES_ALL_ENTRIES ? ep->dentry.file.num_ext + 1 : type; @@ -882,7 +882,7 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, if (p_dir->flags == ALLOC_NO_FAT_CHAIN) clu++; else if (exfat_get_next_cluster(sb, &clu)) - goto free_es; + goto put_es; sec = exfat_cluster_to_sector(sbi, clu); } else { sec++; @@ -890,7 +890,7 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, bh = sb_bread(sb, sec); if (!bh) - goto free_es; + goto put_es; es->bh[es->num_bh++] = bh; } @@ -898,12 +898,12 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, for (i = 1; i < num_entries; i++) { ep = exfat_get_dentry_cached(es, i); if (!exfat_validate_entry(exfat_get_entry_type(ep), &mode)) - goto free_es; + goto put_es; } return 0; -free_es: - exfat_free_dentry_set(es, false); +put_es: + exfat_put_dentry_set(es, false); return -EIO; } diff --git a/fs/exfat/exfat_fs.h b/fs/exfat/exfat_fs.h index 2ffe5792b1a9..324acc57d029 100644 --- a/fs/exfat/exfat_fs.h +++ b/fs/exfat/exfat_fs.h @@ -493,7 +493,7 @@ struct exfat_dentry *exfat_get_dentry_cached(struct exfat_entry_set_cache *es, int exfat_get_dentry_set(struct exfat_entry_set_cache *es, struct super_block *sb, struct exfat_chain *p_dir, int entry, unsigned int type); -int exfat_free_dentry_set(struct exfat_entry_set_cache *es, int sync); +int exfat_put_dentry_set(struct exfat_entry_set_cache *es, int sync); int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir); /* inode.c */ diff --git a/fs/exfat/inode.c b/fs/exfat/inode.c index cdcf037a304f..a84eae72556d 100644 --- a/fs/exfat/inode.c +++ b/fs/exfat/inode.c @@ -83,7 +83,7 @@ int __exfat_write_inode(struct inode *inode, int sync) } exfat_update_dir_chksum_with_entry_set(&es); - return exfat_free_dentry_set(&es, sync); + return exfat_put_dentry_set(&es, sync); } int exfat_write_inode(struct inode *inode, struct writeback_control *wbc) diff --git a/fs/exfat/namei.c b/fs/exfat/namei.c index 8d72527dfb78..57510d7f58cf 100644 --- a/fs/exfat/namei.c +++ b/fs/exfat/namei.c @@ -676,7 +676,7 @@ static int exfat_find(struct inode *dir, struct qstr *qname, ep->dentry.file.access_time, ep->dentry.file.access_date, 0); - exfat_free_dentry_set(&es, false); + exfat_put_dentry_set(&es, false); if (ei->start_clu == EXFAT_FREE_CLUSTER) { exfat_fs_error(sb,