From patchwork Mon Apr 14 13:34:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5p2O5oms6Z+s?= X-Patchwork-Id: 14050442 Received: from HK3PR03CU002.outbound.protection.outlook.com (mail-eastasiaazon11011025.outbound.protection.outlook.com [52.101.129.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6651253941; Mon, 14 Apr 2025 13:34:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.129.25 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637699; cv=fail; b=qqRgnpjClRGaxQ/LkQ3T7zQvYk+VT1G3tmGdgv8e9pgpzcD/qs7wNh6GLiDSeCmmNjEitq9mB9V4U5THWU5ALgfgPDngFbUaPAqjWXw/sm6XPFWeErFix6Ft7YMCPtagLu9bHIjyYmnKQ5AlOqZC72ZqNIyXGGUIwyfdbmAb9EA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744637699; c=relaxed/simple; bh=rscZi8r7STK3azsWmKAdAgFsYNcHIxhcauxfc+k1bjk=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=gDPEkzmaDYBI5Z7dl9XhS+yQyUxzk9kXizLcUaeHrXtnIAcsjHL7oMm4Pl7YzTh4YNTkN/2KVgytq74rWSF2blBcfTTqECth1dpYZoGDeeQi7SonZBMnQbur1hFhBB/DIUei0UY28JAdICtK5zC7gMqC5CNNrwLLphp/yrNzVPs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=fAww/TFe; arc=fail smtp.client-ip=52.101.129.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="fAww/TFe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uSCuGKbTh3qNBDjF+UT700x7GhDPoM5PEzp+f8qEBpVGKi9eAy9gfAPOyri0GWxb7WoVxKpwn9YyC+tANgQPJry9OFhKRfK/uljtsf2uhdfsZ68UWpY1OgltawV59FYJopF/x8vx4q1X0p4f2tCGmkbLm5UGknI8ijVBaDPrW+vVjwfgYS2mzBbYiy0/guOECp71Byd0aAzkKRwu0cy03Uruhycuogaih0kVcmhw6iw6PgzRlW7MJuPxJsuh4+yebyaJrh3e8g8mPlmb9vivszTI6hRCyqnlyuonikXJLX4lYaTzslMiU1NtAfuCUFhEX0tjyzOuZ585l7HcoUaAPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=rscZi8r7STK3azsWmKAdAgFsYNcHIxhcauxfc+k1bjk=; b=MBHGO8rPU3TOVaZtzJBMNwko17uG6sEoCRwrLsrlfXG0sqF93mnc/eV67fLNUK+zCjuo6Khd1u80H8liBedWCWRnGS0pFi+IxiBSnJHR/uqxtyPW7WGJCqUgLtb86Tnj2WS2wMA1rE+IywClQM5KdPq83mpY1JTXHiV+zh9OcvJGr79UMFhyZfciwEL0U3OLoEO6i0yaTqcc8I8NliS1S5c/wrlIc1ej8OEWw8ncY5dMSnX9Lakedst84aGOyNQfvuaeb5OWYQbq/sjMfJOrDhOy3vD3JctC+BFgXt7aeNxZZMFkpzztKseAHRWBAeEx5tobLVASeL7Z0JZalrAo5g== 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=rscZi8r7STK3azsWmKAdAgFsYNcHIxhcauxfc+k1bjk=; b=fAww/TFeT1XjtWmOelU34Vmz22A/Du16CCsfwDCYktBY/KtVTRTflW5kLQk/xznjpXz43eCbkCIv1axCbAl/x5IYi3H1dbSnUkhwMjYd4hIq/tcCyvycDj1jbr0r6mZStdoBNIC69xlO6bXNYcmK1OG6uvS8A3twrKf451Pp2FnQGEP7ex7X5xI1UvWUdel5UB6sWCygCkdseOvNPEn7ficuUItaU/TJBnM5ThgrycoYQDoIucycJjGOrCLTvuIgNMd1xTca9kKJ4TOWjioLg0xeJLVCc3TN/sTZysPnZ6jvF6rgC+oglHi+hCEBoAs81XWQ03k7gd5qCd8SNvAPKQ== Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by SEZPR06MB5716.apcprd06.prod.outlook.com (2603:1096:101:ae::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.29; Mon, 14 Apr 2025 13:34:50 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::8c74:6703:81f7:9535]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::8c74:6703:81f7:9535%6]) with mapi id 15.20.8632.030; Mon, 14 Apr 2025 13:34:49 +0000 From: =?eucgb2312_cn?b?wO7R7+i6?= To: Daniel Vacek CC: "clm@fb.com" , "josef@toxicpanda.com" , "dsterba@suse.com" , "linux-btrfs@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: =?eucgb2312_cn?b?u9i4tDogW1BBVENIXSBidHJmczogdXNlIEJUUkZTX1BBVEhfQVVUT19G?= =?eucgb2312_cn?b?UkVFIGluIGJ0cmZzX3RydW5jYXRlX2lub2RlX2l0ZW1zKCk=?= Thread-Topic: [PATCH] btrfs: use BTRFS_PATH_AUTO_FREE in btrfs_truncate_inode_items() Thread-Index: AQHbqpFIg9HIbLnZH0irURSLMAJ0/7Oeg9IAgASqZFA= Date: Mon, 14 Apr 2025 13:34:49 +0000 Message-ID: References: <20250411034425.173648-1-frank.li@vivo.com> In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SEZPR06MB5269:EE_|SEZPR06MB5716:EE_ x-ms-office365-filtering-correlation-id: d3ddad67-0375-47f3-011b-08dd7b592145 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|1800799024|376014|366016|38070700018; x-microsoft-antispam-message-info: =?eucgb2312_cn?b?eWVnT2RlVFp1Z3VTcmpjbFdJNzVJ?= =?eucgb2312_cn?b?NXpxMnVIdkNadTFnR2tXclVGdnp0d1FGSVp6aXNvdjYxbmRPejFpL3VQNjNzTFNN?= =?eucgb2312_cn?b?R3NXaXRJNUt5VVhDcXNtK3RTd0poV1Bsa0ZrZHpvREp1NDJUajdIV3pBdzQ2MTdn?= =?eucgb2312_cn?b?ZHNpWlN4WnQxbG1VdmRmZHY1dlQzR09jNXZ0dW1YTmtENGkrZ1kzOVVIbnhWT0ZP?= =?eucgb2312_cn?b?RWVkNjVyRGtnUTc2bG5KR0JDUFFQSHc0NlV2NmkvM2pBU0ViS3J4NnNLOTlvZ2dx?= =?eucgb2312_cn?b?Ly9YSlFPS09PeUxFUGxVZG9SNkFCa2hJQ2dic3NYTEEvRkE3eUhMcWtNL3pJdThK?= =?eucgb2312_cn?b?VFo2L25yVFVCUG4xcWJsM29Gbjh2THZqYmpxekhZeHVja0VaaHJNbm1oOFV6dWhS?= =?eucgb2312_cn?b?c0FxT2hhNE1YU1ducms4V2FqZHZnWmQ1clBzblRSM25xMmpuem1WdHRrNHFvUnAv?= =?eucgb2312_cn?b?bmZRV01SOFBBajJVS3hnWHRxSzhYc25UaWJHbkJQeUpzUzRHdzVOWDExYUU2VEt2?= =?eucgb2312_cn?b?K25PTnVuT0hyM1p6aXRTSGZJZFczZGkzdkNWK1ppbWdvd0VSL3dxWVdmREtpK2Zi?= =?eucgb2312_cn?b?SUl2UHk0UVFvVDZBL1BXcUU3QlQzVFErNEFzU3p1UTlCU2g4ZGZRaHZmemM4MWlj?= =?eucgb2312_cn?b?SHhHOFIyc0ViT1F3R1hqWFdNdmNVMmtOc2NMV2cwY290SVFnTkJ3c05MT3ZUWSs5?= =?eucgb2312_cn?b?emtQMzRxZHcvd3V4eDVMN0szbUNyejlrNjNjSVlaRGI0ak1IZnhKWjc5NEJZZXh3?= =?eucgb2312_cn?b?RE54NWRDaEp3UXV3cGV4b1F0WG9UWDhJTkhIZmtEV1ZxVFJDRVl0dWF2UUxMOFdB?= =?eucgb2312_cn?b?QzVFaFR2VUR5c0ZsbVBOV3N2bHJuYnlvbDQ0a1RBeDdxN2psdXUyUVNTZnBXbXFn?= =?eucgb2312_cn?b?bzd0RWRTcktoR3kwSjN4MWpFN2pOazV6RUJycFVwR3pDblJ3RjBoSnkzcWQzeVpr?= =?eucgb2312_cn?b?amFEakJGc25KdWsxWTMyVjVCYzhXRHRqZ0ZHRTVxN3pKcE5HUkFvMWxPdWRzU3Z4?= =?eucgb2312_cn?b?U2JkQThvd1h4anFHcG5PaVVXbFREOE4wdFVKc29TUSthdnhSalA4clhJNlJ3Q2Nt?= =?eucgb2312_cn?b?aGJJNnFHWEFGSWRTV3hlRjBmZlU3Y1J5aHQ5VWpXUG5Jdlo4VUUvVW1Yd1NVR0pY?= =?eucgb2312_cn?b?ZUE0ZHliYVAyOExNSlpvL20rV3ErVDZHVVZsalNGbUJGTVBXd1IwM1VTVzVzdEFn?= =?eucgb2312_cn?b?S0NmSllXdmxTOGlNaDE0aE9TbFFzZ1RMSGRtUnFkZjB6b0x4alVWekV4OFBhdDJ2?= =?eucgb2312_cn?b?V2x4bHFXRFhUdWJVT2ZpR081S2hnMGFzZmVpV0F3TkNrM2Z2bVJBU0xEU2JwZ1JT?= =?eucgb2312_cn?b?UTcxUzFUaUsxU2o1RWh3ODVkQUlvSGZuSkd3T2hhMUd0anJsbU5pNXNObDVRYTBJ?= =?eucgb2312_cn?b?WWRsOFp0NmZHOVRFb1pJNGt5RmJOUWpGQ3o3TlpGbzdTckl0ekprZUhNWGE1bTkr?= =?eucgb2312_cn?b?U3ZKMldhSEVveXFhU3A1dzdndGZVeVNhZnhyRVNkTHppeW45dnVQcGw2dVpQdUUy?= =?eucgb2312_cn?b?TGlKT2xDYmh1N2xjTTBGenEwUHVuUStsWnh4MmVpaTgvbmYwY0MzZytINmtFdSt3?= =?eucgb2312_cn?b?R08xbjdDRzBBUDBTOG82a3Q0QStzczE2NDcyVHQ1eSs3elZGaEh4d1dFU2puQnR3?= =?eucgb2312_cn?b?RHFEc09SeUZjME9kS2dVbkRuRFZkamlUQ2dxQy9HRjhUU0VFOXB2R3ZCS28wclJB?= =?eucgb2312_cn?b?MlB4aE8xYlFKTlZldXJqSTBRR1ZLcmo2b2dNZnpDQmliRS9Fb2RQVmFYQmlENXV2?= =?eucgb2312_cn?b?ZFRBbE01eHRJeFA3MVBsSHQ3OGdsUXIxVmNSRGdCKzZ2OVpNVlR0QU4vUVNuNGIr?= =?eucgb2312_cn?b?aDZQNDNWcTA5Q05Ia01nVFNhU29sZVVIaGxuaGQ1Q0l6dTZ4UVdRL1BIUGxPaTlm?= =?eucgb2312_cn?b?cnlOZkVkWFVYWHNRb085b2ZLVGpDTUJRRUJXSWtwVTdBPT0=?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:zh-cn;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5269.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(366016)(38070700018);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?eucgb2312_cn?b?YW52WWNWMjJEWWVWYVIrMW9W?= =?eucgb2312_cn?b?cy9lSUVtVmN0MkJLTkZxOS9SVEhYandjaFVURStEVXhuZzMrN0I1dVR4bXF5VTFo?= =?eucgb2312_cn?b?RHdPZTVWNnVLU3FCcjV6YWV4aTk4alJLSzdCbDNIYmNFWkNhcFlWSk1kMzBqSlVX?= =?eucgb2312_cn?b?Vm1UQXFac1ZVZXJ0ZW9FbDgwb1NzdlpNRGU5bndUOWpGYVZoYlUvcEFsSUdtd1VW?= =?eucgb2312_cn?b?ZEp4bXlDRFQwemtpSDNvVW1acnNhWHdzRllUS2xIbVMweXBMQ3F6bjQza05obm40?= =?eucgb2312_cn?b?RWp2OGN1Qk5xeHFvV2dhK3JkM3BxUHhJUGJOWkpMblNJZjdmQmUyNWgySjgxeVlN?= =?eucgb2312_cn?b?TTcvNmNWQUlLdG9Yc29hdnkyMUl1c2FVYlhwVWM1UFZ1b3JMa040bjVwSlJXK3cv?= =?eucgb2312_cn?b?Rzdvcy9TZDVJMkdWem5oc0FpdmYxQ2hqWDhFc2RCcHdFMWNFWm5SaWJZbmxLZlJK?= =?eucgb2312_cn?b?R0RyZ1NKbFFDMTdOSVFrU2NNNDg5VU9qZXprTkFlbXMvSFQzVkFBVmh4bVVVbVFy?= =?eucgb2312_cn?b?U1Vka05EdjVyamlpTXhvc2dxcDViU2E3dk1TV0U4eWpoS0NzLzNmS2Q5Z1JCdER1?= =?eucgb2312_cn?b?OGJZSU52Vm1ZNnN6aHZCK1lJQlZoNUhQVjhCTzlBb1dOTWhaaWhtRksxRTN3V2s1?= =?eucgb2312_cn?b?NzczcjdiSjRPdWhjTERlb3FXWFoyS2sxNGdKdHdxcFhuTUxPYS95dTI3WkYxb0Jz?= =?eucgb2312_cn?b?ZFBoNUxPcWRCRnVLN1NhQnVhY2VJaTJZaWZVOW9vNUZkVzBjb0U3cDdVNEVkeEhE?= =?eucgb2312_cn?b?NjQwZjlybGJtODJxNUNTdEY0SnZFazJzU3psTStOQ01NUW5reVBzdE9jcG5KUGVk?= =?eucgb2312_cn?b?Q2EwRkhRRXNDSE1kc3RaRGEwZUlRaHJQMmxwSkdNKzRLR3dhWEcwT3Z3ZVZ1OFdr?= =?eucgb2312_cn?b?Ym4xeTZKNndQNVRRanVCWW11OXRkZzN1K0VVT2QrQlc0RkFMWEFPa3VyNWgyaDhz?= =?eucgb2312_cn?b?WDkyWm44dUNpMFlhTGhVTzBNTVVsL0N3U05KTk5BWVlMV3pwRWMyQTh5WDk3UzNP?= =?eucgb2312_cn?b?RGI0bDJZMjhobVNnQnR6TzhwODZyN040R1pKWVBGSnkrVS8yT2VTR1pSbitORFJy?= =?eucgb2312_cn?b?Y0h1azB5TjZ6TFpRek9qQVd0VUo3Q3ZObDBZYVZmU1JHSXY5cHJmamVYam9mT0lU?= =?eucgb2312_cn?b?T2pHcnQ5dkVGRittT1ZSaHpKVkNhdnVNblRlVlVhSkF4cW5aekhvN1hVaUZYcHBp?= =?eucgb2312_cn?b?VUdkU25yam1KTkZ0aEI0NkM4S0tiSDl0eUNKd1BiMHZGUHlDWU9HRXBxdUFzSmht?= =?eucgb2312_cn?b?S3ZjK0QrMEZ3UGY3V3ViSXZ3VytoZjFpWW1UeHdFWHo4S1R1N2pDblFYSnM3WFdB?= =?eucgb2312_cn?b?QVhiVS9WN3Axc0E0NFVVam1YYThNYWluNjZaR0EyVEo1QlFNTzhCd25ScTU2QnEz?= =?eucgb2312_cn?b?VzFDYUdZTzBEdTBEckdMNnZFZ3RqZTc4TlZWL21YeU4wdzRhaGxWQ2tVcTBJVGhL?= =?eucgb2312_cn?b?M1RiY2FrblRDSnFPclBHMnhzREk4ZHdiS1B4VkFHaHF3THBoeUlmdHN5R0VvQTRj?= =?eucgb2312_cn?b?b2MzbStwV0JCclk5TW5YdDh3TVFWRzVMT2s4U2VhNE5iWVJlSXZyeGhGaVVzZ1pa?= =?eucgb2312_cn?b?eitCb0FiekhtSTJxY2dhWDR5QVdWSXZOSEV4V1Z5dnFlUzNab2hFeHZ6STV3ME5C?= =?eucgb2312_cn?b?Q2t3QXY5MUFTTXB1cnBJcUkrMmlDMG52Qk1xZ2JBZnlycnN3Q3hDcTRBbVhNVytr?= =?eucgb2312_cn?b?MmJqWU5IRlB3eGVQb1FYbkdJV0hZVXAvZExFeGhCalVxRkxPYU01dlh3K1dwdVNQ?= =?eucgb2312_cn?b?dVBpMDNENmUwV2tvUnhoMXV6Q21HYWkyUGx4YU03eVhhaTlsYjliQW1HZi9IWGtr?= =?eucgb2312_cn?b?cG1mNGJmYWQrVVA5eDdxNHRCd0Q5bDZ0NW1Jc09aK1B6RTdjUE5HQjhjMHliSEJm?= =?eucgb2312_cn?b?b2E2eERMemFwVW5Ya1B5TmJ3d2tIZ3pzTDgxZEtNQVNoV1l3bHM4cjJoRGlneCtz?= =?eucgb2312_cn?b?ejlVcW5kd0xzVDBWYnM3dGh2aldsZ05iS3MrSEYvTFh5ZVM2dmxwcFJtUDAwTFcy?= =?eucgb2312_cn?b?dTZiYm1QdGpxbVByRHUyUHhwKzdZNlhnaz0=?= Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3ddad67-0375-47f3-011b-08dd7b592145 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Apr 2025 13:34:49.6348 (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: 3PDBagUQpx//ueM7B0G3x51ypbpkTgg2vDL1N21mNQsM40PoahNg86KRGvteb9rT7Sq8cth8EWB8oxDbvREQTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB5716 Hi Daniel, > And what about the other functions in that file? We could even get rid of two allocations passing the path from ..._inode_ref() to ..._inode_extref(). I made the following changes, is this what you meant? I will do the rest if that's ok. Thx, Yangtao diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c index 3530de0618c8..e082d7e27c29 100644 --- a/fs/btrfs/inode-item.c +++ b/fs/btrfs/inode-item.c @@ -105,11 +105,11 @@ btrfs_lookup_inode_extref(struct btrfs_trans_handle *trans, static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans, struct btrfs_root *root, + struct btrfs_path *path, const struct fscrypt_str *name, u64 inode_objectid, u64 ref_objectid, u64 *index) { - struct btrfs_path *path; struct btrfs_key key; struct btrfs_inode_extref *extref; struct extent_buffer *leaf; @@ -131,7 +131,7 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans, if (ret > 0) ret = -ENOENT; if (ret < 0) - goto out; + return ret; /* * Sanity check - did we find the right item for this name? @@ -142,8 +142,7 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans, ref_objectid, name); if (!extref) { btrfs_abort_transaction(trans, -ENOENT); - ret = -ENOENT; - goto out; + return -ENOENT; } leaf = path->nodes[0]; @@ -156,8 +155,7 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans, * Common case only one ref in the item, remove the * whole item. */ - ret = btrfs_del_item(trans, root, path); - goto out; + return btrfs_del_item(trans, root, path); } ptr = (unsigned long)extref; @@ -168,9 +166,6 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans, btrfs_truncate_item(trans, path, item_size - del_len, 1); -out: - btrfs_free_path(path); - return ret; } @@ -178,7 +173,7 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, const struct fscrypt_str *name, u64 inode_objectid, u64 ref_objectid, u64 *index) { - struct btrfs_path *path; + BTRFS_PATH_AUTO_FREE(path); struct btrfs_key key; struct btrfs_inode_ref *ref; struct extent_buffer *leaf; @@ -230,7 +225,7 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans, item_size - (ptr + sub_item_len - item_start)); btrfs_truncate_item(trans, path, item_size - sub_item_len, 1); out: - btrfs_free_path(path); + btrfs_release_path(path); if (search_ext_refs) { /* @@ -238,7 +233,7 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans, * name in our ref array. Find and remove the extended * inode ref then. */ - return btrfs_del_inode_extref(trans, root, name, + return btrfs_del_inode_extref(trans, root, path, name, inode_objectid, ref_objectid, index); }