From patchwork Thu Nov 17 05:47:12 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: 21448 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp230359wrr; Wed, 16 Nov 2022 21:52:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf4vlZkT3sUJap4/4C3HJd0rCJHJEy4jpuMDOAZWVFy/BcsCw6+wXTTKVpl5Pp+bD3TiOEo4 X-Received: by 2002:aa7:df18:0:b0:461:8692:2787 with SMTP id c24-20020aa7df18000000b0046186922787mr835429edy.199.1668664350562; Wed, 16 Nov 2022 21:52:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1668664350; cv=pass; d=google.com; s=arc-20160816; b=a1gqOJu1rHrjl9hKXDrKmaLAik3UtWmCVoTVFFiMk8J0DgVQ4HM0yY6hTpE1VMvju1 nAn6tC+aDJzaUHONkoegxpTw6OuFqhUVFYuSCSFdVUK6DhsmV4WVxZ2LUQUgMdJUrDbP X9y4Xz8QJyLHey+Ha5IQLVij0yUaX2Ql4rp+ZNo8+r7Jd+wTkQg4gSOKc8zsfNqcorbz BRrpduyecSHzi4NEr6NrXKzn1dOxxUHg6rzOGtjg99g5iPqdEsm7RTotFl+UpW82DO0/ mvnNstSYw/10tszeEk9BBQLnrNT4lks84EdAFMu34LG0so5YiJ8SIn2hckEyC4Pmpa8q 5oUQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :content-language:accept-language:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature; bh=Xl6epq/qeJZ4Rsw8DiBZ8n04id10ZVp99f53Prdx5IA=; b=vziWBLdwZvAN5wF0tLBm2nBUKUKDRcuUseHdbGmUry87r9f+TisoCcIgXqozpwuIpG U2FCuUx9WE6VGenFZjHJT6sTIFotcbKqrYkZlDNbUExM3ewBfl4fVhMv16qZn0I231YW qe12YtxTQFw9eAYdIRZZ1MsaL2Ep2X6N/mfihfTstV0Nl0BVtCnFiVm6D/8cqFq2PlP+ e5EPK5yCm2m7MyDV97epnrtCb2WBrvPRlx/RDibaLrRY825YigM7Eu5k7kmEBj1KdjQp x+bluf3LZoPdfCVoG0QhbiJYQJ22v8GG/iC8pBNZHE5A+d9cbSHZWm0y2WjZxjQ7mbyj DWFA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@sony.com header.s=S1 header.b=awfP416+; arc=pass (i=1 spf=pass spfdomain=sony.com dkim=pass dkdomain=sony.com dmarc=pass fromdomain=sony.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sony.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dp14-20020a170906c14e00b007ae6f13645dsi17647869ejc.498.2022.11.16.21.52.07; Wed, 16 Nov 2022 21:52:30 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@sony.com header.s=S1 header.b=awfP416+; arc=pass (i=1 spf=pass spfdomain=sony.com dkim=pass dkdomain=sony.com dmarc=pass fromdomain=sony.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sony.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239297AbiKQFst (ORCPT + 99 others); Thu, 17 Nov 2022 00:48:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239286AbiKQFrm (ORCPT ); Thu, 17 Nov 2022 00:47:42 -0500 Received: from mx07-001d1705.pphosted.com (mx07-001d1705.pphosted.com [185.132.183.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 852C06F36D; Wed, 16 Nov 2022 21:47:29 -0800 (PST) Received: from pps.filterd (m0209325.ppops.net [127.0.0.1]) by mx08-001d1705.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AH3XZBv009986; Thu, 17 Nov 2022 05:47:18 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=Xl6epq/qeJZ4Rsw8DiBZ8n04id10ZVp99f53Prdx5IA=; b=awfP416+C2VaI/UQhMOvdZUqFCzd7LNJi9php2R+GUqbSO8G62pSSVSr1uSAM+WKvgTJ J2+BU2hT5FW68ZaR7QWTxnbuP5rrdYB8QmErq0MGnCiUlRj05gImG7M/xQSSTEVhrBi+ R6XucUjWKzPwOru5UAthHq0/8SHtc+fnq81EzCwI3tA8sjonQTl4n1NG6eSGNvDu/0TS +FwiFQwGw8FUsI4PsjJteTIsUlvvfOcmVDml1MBFDw+rJ2/fXzJ+WQM431YC2MP96d+5 f099XuNw0RUWBwLLYGwT3HogAFlPO3eBWT5H/WWWj4oRu4K1hNxfBPN5vCdAf3h2f2YU dQ== Received: from apc01-psa-obe.outbound.protection.outlook.com (mail-psaapc01lp2045.outbound.protection.outlook.com [104.47.26.45]) by mx08-001d1705.pphosted.com (PPS) with ESMTPS id 3kvn8yhf2x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Nov 2022 05:47:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nwJoXqkGyv1lgkjR01HU0xut3/JkzIIW19TYWhW21zhtEHGAHcWgLjBcUyrvQFGlDT8NBAQc9DyPyTKf+FbaCpBmu0uFHlMVMkMdutMhOGwip7pOJWA4s88MnyFXYxBRLEZ5hDxZeG7cnoGgXMKOx+Unj3v51wpbPy/sFqkhz0JdhDaV61gWUZPgq+hJTm4kETPZPNc6alGLIUU9GwfbwawpLDXs+0PAshlyMSopa6NLVbHSZvyLvPiL96jI7XVFoVY7CSXbN0Mfp3oYldG6pb1n3pO729TGZgYnujRUDhe+wfxHeoHsj/qg+pyNRSXEQFSawpRe66yN+3BghybL9A== 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=Xl6epq/qeJZ4Rsw8DiBZ8n04id10ZVp99f53Prdx5IA=; b=dT44dmr/XZj4uH3gQhsd9ULwhriWvmeP3L0tPurFYy3nm1rbBYfdJBjoRUx6d/3vJrUYgQ4s14448Mbe/cxshk/VYJGS5RV4kAIXiVaj2EKoTzbEQynlGxb8Sr/0SYfUw0D6n97hYp8FMxDT+rCy1houHlLPoYZBIEjhkDzBE8jBVo8INFTOYzFNl25xgY0I+FWlAYww/ALRx6adadFSAgvymwc7JcdH5E5lduDgje6HNL68o4b5ncJs7NuGjHLrCMWMAwMyeJGbRA+sYJF2DMUOx7P7/TE3p4aWGoG7M7O4wBOurypsUNF6JdHnZU9Ip0Bg7SAFjKkkIXUmhCRE3g== 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 PSAPR04MB4134.apcprd04.prod.outlook.com (2603:1096:301:38::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Thu, 17 Nov 2022 05:47:13 +0000 Received: from PUZPR04MB6316.apcprd04.prod.outlook.com ([fe80::708b:1447:3c12:c222]) by PUZPR04MB6316.apcprd04.prod.outlook.com ([fe80::708b:1447:3c12:c222%7]) with mapi id 15.20.5834.007; Thu, 17 Nov 2022 05:47:13 +0000 From: "Yuezhang.Mo@sony.com" To: Namjae Jeon , Sungjong Seo CC: linux-kernel , linux-fsdevel , "Andy.Wu@sony.com" , "Wataru.Aoyama@sony.com" Subject: [PATCH v1 4/5] exfat: rename exfat_free_dentry_set() to exfat_put_dentry_set() Thread-Topic: [PATCH v1 4/5] exfat: rename exfat_free_dentry_set() to exfat_put_dentry_set() Thread-Index: Adj6Rv6JmOYi1/+VSsabj/HqJj5hLQ== Date: Thu, 17 Nov 2022 05:47:12 +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_|PSAPR04MB4134:EE_ x-ms-office365-filtering-correlation-id: 42828182-005c-4b9e-f62a-08dac85f2d19 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Ba5eGbXgNLyyc2vmRxAjAkwaEpl1Z+hFHwkRz3eeaIEpyg97ztnt2dXvk03F4zCIxKPFdt31kGM4Ata0hKINta/4mHfqkjh00XEnTyQdIplnAKE4DAiWlhdmejom7V3bl7k91LhKulBp8mLb8txEaslqGsSFocA+Z3cdcmv+R0RzO9Zc1lxgN7bBS4HS1YrFcuL5sZXx8Cw9nESdYMFh+o2MHCxfG74Z9/RgtI3KslT339JFG0n5PR+anG7ZArIs/3ttm2mVW6l2hCPwf/3l0I+oGSL2omNY6iou+DqtB9CiIRAo7hrsuZia5RZctKjbkX8gm86R2OgiylRKir0ogxnT349GCpRaaYvirzIpHnfBmtvXnTBNTZDdIuGpkxCssvs8P+eq7NCc1o93JDIG/MUMr8qp1WKat47O2wsHjXIhnoiUzUs0sTpsBMkkfQiCzHqVGBMeHIwwcpkz7DQXUFI2Vlu9TzBZh6N8Rithn8l93sMES4qQm9068uJ/lGJtqUWftQsECHtv4uazVgn9jqsXox6rLgVBVVtaspTKHBxydt1bP3DxBBNRl/ipS1cMQG1zZ5piDly6S6uXNxexB7aQRRCyhZZpV0UecgHFqv9qsOVnpDP0iiAiT+ZfxszGuvAHHJEyHBA6G5T1ODFDKFVfbLPEaHacH900Usr/wNkNLWF44ZhQpPRKKrT9qCyOvg47Yaafgn0NZ80Vph8ggQ== 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)(136003)(346002)(376002)(39860400002)(366004)(396003)(451199015)(33656002)(316002)(110136005)(186003)(38070700005)(54906003)(71200400001)(107886003)(83380400001)(6506007)(26005)(478600001)(7696005)(9686003)(2906002)(86362001)(55016003)(66476007)(66556008)(66946007)(76116006)(64756008)(66446008)(8676002)(5660300002)(4326008)(8936002)(52536014)(38100700002)(82960400001)(41300700001)(122000001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?HfRJ75dKZaf2UBSmseCQxQ48vQNs?= =?utf-8?q?buDced48VUxMMzUvTF9VvHPWnCY7mlgD3mVIG91wyw6qihHwbxJcbkrnH9e7VMFdc?= =?utf-8?q?8aUEzTDkXEBlrdSC2vdxqLPDSnqjo0a2cahTRoiSgN4BA2idNZq0v1G1SAefPFQHz?= =?utf-8?q?2wq6LNmj+og8jx3WIJg0xyblvs9pdF++49CmLtJFOTq020eCdWnvaLp6XmV90iHt1?= =?utf-8?q?OvQWIqK2Lxo/Q3M49aWiGaKRzMFnNW/Ax8JeJsjuDtgAfjlfF1oDe8Clx9lRaBgYL?= =?utf-8?q?iVMbi2oUpHuASfi7VtKWW4KExVz1qMDi8wHYH9ikCrx1avVRn2BVt5WZGz4/U19wN?= =?utf-8?q?oChK0FZ/SgUbdR7nI+h7v+SrlB4aWsP35TaM+HVt1ug6aMoRRp6p7lbokFpE6K/T5?= =?utf-8?q?Ng9J0ozQZ0vdeXdHjXMGErNu6eBihXfpx2Mm1rAEI0ijD5+zx6gqC9J1PXEB1sg96?= =?utf-8?q?fFSoO9kqHklrWd1Txu8nUOygxrnZZhwqA/qeSnLFwxrMqmAC8CmtuvTI+NkkwBl70?= =?utf-8?q?lXn1CnNILanjXdHzTrUiWbXvss/BAyPiQeLPnhz0OiUpKb182wSbNbL2Dyvat24Sy?= =?utf-8?q?i9Aw37utKaGW6Rj/euzUUG1tfiP+bS3Ft11beMmeAo99PEVVquCJ9zvq4IiMQCT2y?= =?utf-8?q?MwE7SbuKQZaKtbVuUjuZT9pxqrO3ZI2HIjJ+A/Fa1YfFS6ebmUdKhZ1ZuCC7H2R4x?= =?utf-8?q?XUEsTnMzNSTBg5q9Fd+8AgXu2LLJB2qBa2jNnKPmeIsIAkJ7J7CE7FmII0RpYE18D?= =?utf-8?q?e46J/YBLCeGNXetIkSZGIbkv/ztuVGxqB8pXZKaIU/IpNvhPsL/GPI0Y+obw7IHlF?= =?utf-8?q?8Y7Vszv2y4+iN211MeTKeVh1vcYNMhMIwEPW9gYsiTiDtfg5VazE42o0ApAoTHzRj?= =?utf-8?q?C2lrrldyOVex2g/lKU7jY4Gwb6YfMUonVyFQ4cYkZXTZpZCtJ+iBiZIQNi6L9qdKi?= =?utf-8?q?NPHvJajv9kZ6BUb3vQ/e/PcJpHQeR4gnRzOlY+iV+JP2E+7l/Mqzd9neGG1WmxY1J?= =?utf-8?q?/rW6+/sRP583w3K8Qv9hq0Cq2DGte3I3ANODqKtZatXc016Lx3CbSQKZbIn186Wva?= =?utf-8?q?sy6MuxZTIPIhxZzu1POmC0kLTQzR7p5aySz0gtAs8xExWBgeXCnpsqmv2W/qW40Xh?= =?utf-8?q?VRrXv4RGbrX1akGC3vnb0sjwxAoA4j1dDZ0LpBeHRJXjOiXJ0vzBTkd3luvzGeA45?= =?utf-8?q?XoKoiDunljE2h+KWibYGS1RYlSmFHYO08Ke5yR4BL4uwitq2LtdzBf4/BNYzGxnK2?= =?utf-8?q?wrtJXrF4NMWDhFu6208LpuooOedoYLYN5yodqz8KGPW8ocr6Ah1qDuSxBbx4BpYzX?= =?utf-8?q?piiLHBsQC0JVZy67QWfXAkYAZPcZlQ/DhbkWvsKymzA6QHhbcb2JY6eN7Ek4856Dm?= =?utf-8?q?lwiSfVUeb23pa9YDryyWPD5Wlp9zc5I6PIgGUbNJKxamgwaM+wRvZw7n4qqPi7AzT?= =?utf-8?q?ANkptIHa81EOcEBF01AOija60CQ2oTV0nq7TWDAwh08oyZ9bImK0hZTCVS3OgqdhW?= =?utf-8?q?1kt46lvkY+Sl?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: dJdULTa+TRBTbdym0HwQ0mHSp1E3j0kn1r5ou5yzWDSR5YPqzhrgAFQw+VD8M6yoDq2anNpAxulIuPVhl/WOFbIzDc4kH73hlvn0qaO6nQuoBaFHSQ3+u7B/jemSeBGQZhPBBTVyXtwQThgxpMGuy18CA10okDVdLUlFtut4TyNolh8x2rKzvg6a9/DigDuJ3sJB5pLyTFBIIDSaP42xQuM2jFJEWuqaTC7w+tJM4VW8y+d5RMnQvU9qsJrseuvVQAnRoXCvw+lCsUfuBdSfOfk4l/5qf0RlR7jUHrOddCe1i/m02Fua8c0ok3Q51vszjdkOZBGQp4B+TszgxFNY4iq9S14IOKW/yBsIneMj/fM+0AeySpVS5DTSHKzvYVTRjLKMokyM3ZezOWd5UHLJYtRzXGNiDj5256tlkybbaqh0dV/kydllM8GsKbDDLHgQWewO4mZ02s6UK7YfbHqK1LWToVsp6UGW8exdP2V9MbE95RjGUOQ94dVR0kfviTMpTvhoBdWtOABeK0Q9E1qBynFGwvhwqGvmDHX+bRyxnjm/UGu6lyjfa4O8rU3DUaDDCoctMZDekXtRH3WkqLLdZkV+J+jzsOqen1nbiyieuUFB5TXNvy6uA+ILQ0CN05RN3HimNd2V9aApnEymFlC0mNBYOHGU3d6pin4MpYwjKjaQS8KT3/eB6ugQcghkk6JrErYv4Aa3xaJru/Kv7n4myO6mhgdjKIG0/78a0OFd2k3Qf2UBGfc/jm5q8G8S9g+P11EYprl635+Q/ZAuUiZxR2JOeeve+NtBYA3XtEJ4uO67wjJjZCfS2os6InNev2IoP5rV9+VJDccLoPc1jl9anWcmVCqJzLiGkFzbXVlCM/8eZFDkFBmEEuSqqvo3tPYm 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: 42828182-005c-4b9e-f62a-08dac85f2d19 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Nov 2022 05:47:13.0154 (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: QqU0JiuRkAaZV5zueZvyPm5362Z/cys6XDkkLjF6FmVt2rsveejJPcw2Q+w46C2yv9JfVe15yUmRame8+1cryQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR04MB4134 X-Proofpoint-ORIG-GUID: rJ5AGAwZOHHadBgqnPNA1WELoxmTkw3v X-Proofpoint-GUID: rJ5AGAwZOHHadBgqnPNA1WELoxmTkw3v X-Sony-Outbound-GUID: rJ5AGAwZOHHadBgqnPNA1WELoxmTkw3v 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-17_02,2022-11-16_01,2022-06-22_01 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749721389964544359?= X-GMAIL-MSGID: =?utf-8?q?1749721389964544359?= 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(-) -- 2.25.1 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 363b98bbfdd4..bd6ccde190a7 100644 --- a/fs/exfat/exfat_fs.h +++ b/fs/exfat/exfat_fs.h @@ -492,7 +492,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,