From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 2913281989 for ; Tue, 17 Nov 2026 13:26:46 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHDPTVM009573; Tue, 17 Nov 2026 16:25:30 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHDPTVM009573 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="TWY2lG/T" Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHDPRlC009569 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 16:25:28 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHDPRlC009569 Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-3b07b06027eso5845578a91.0 for ; Tue, 17 Nov 2026 05:25:28 -0800 (PST) X-Gm-Message-State: APuU4Z+8FM04d2Wku2LMdaYS5N7b33sW/gyoFS3TJiG1W1g73xOHhvFM Gp+QU8zNgoq5paxEiLHgE1+wNoCh65uS2jJDNqU9fkNjIW5iTj4B8XGzeKCWNO42DR5kXlTCtD2 O+VkA9QE74jDMqG3ptwDnhK+XzmWLGe1xgvtyLSapKLtGzB9iVeg0kA== X-Gm-Gg: AZFdTZdJGjK+FQadHEpUF2JtZZraQgwM+MWNx7QhdzeROhdYFTyScVcDpVXWEy+GIfm r37Bg/0zfEyDoyWOmcFXdOUqidkpoT9697pnVLU1wJz+vPkCh51DIPLHbMC4SzANH657faX4dSg Ys+PdMFJEyUxRh1IsizbV+w7VESD7+amQoNPu0eEldM9nCfTcQ9k73D3are2ga1nsMFDy0IR3si W8ZLpehdsswQrhI0Tug7/+Ml+MapHGRF5XOIXs0uD2vmnIVEDTPMLJJqyYUcFl5Nb6N7gknlrdQ eXssrkY688ASTxLeTI/FxVRysxT5ko1oKmYt5N8nVpU8pbTYwH7+HvpUrf6dbbA7PqsXSmQ2uG8 EzFZhpdaleCJbUnCKMjd4CYPQgMoBHPcVhEsYbWQ9E4qdZyShH426xIk1l4hs+RqsW5ea7+lpNp SN1k8/jtXExGC0tUjlJUYw/Q== X-Received: by 2002:a17:90b:48ce:b0:3ae:5572:c4e2 with SMTP id 98e67ed59e1d1-3b1b0a4e8aemr13053867a91.57.1794921926972; Tue, 17 Nov 2026 05:25:26 -0800 (PST) X-Received: by 2002:a17:90b:48ce:b0:3ae:5572:c4e2 with SMTP id 98e67ed59e1d1-3b1b0a4e8aemr13053847a91.57.1794921926490; Tue, 17 Nov 2026 05:25:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1794921926; cv=pass; d=google.com; s=arc-20260327; b=nybd7AsFUGtmcLPwVy1WZG2U+yv9RlYX+l6vP4aNJQxhrYSxtxViyDnLDJ/n+prn6D L6Pu16huOQcJaY5Jqudm4J2R5zW3J+XNkpK1Nc5hJ2/X19uRIJFDy5ZjQf8anwmIzwyJ 65jEFfY2W08UVkQylu76p+NdmJPP2zL7RTHc2RJNEHfWvK9lI7FTEVFmDnNIY6xbshHk enRrtbfNEdcM1c69XyIalOIBCA1EQSn+iBw92KO/4TOtYjo+kDY5hvbd+mksuOS4+Emy RvSQ0+DgIqsX/+PHo5G2oJIY1U2UKDm6grF46ZFktNp8nTAVGbMqTJ24BlTk2cjDY1F1 OPwQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-disposition:message-id:subject:to:from:date :dkim-signature; bh=a0cIepCHT61Z6/dL76Qak3v1ATV8p3Us0MCyA2QmX1M=; fh=DHZ2Y/hE6dhVx0UmP7zWEGZ5iFhKn/velJV5CC1BbgU=; b=lNaL/17rVW6hvLWnEHfrbLGUlG1TG/2arcvBIZ7qsgkQUPVxtHA8CXp1eUtouliY9k Zvr0gAy3PtgT94ifAYI/3y7y8qUOZixq17LCakHhTR13+nwCcw6ZGM7BzyJ8tfd94bWM zeo8NQXxbe4sLlp58PkT0N06c9pR1RsVBAZYOru89YSgTU00V94BLm0jmNLf+Ux7gGwE O+juVlQrWMGF1DdChka/rNh/oQ45AMhsdK0sRagRHFZIlY/VZKlM3UQV/hpLMccWjypV lhjUKgzModOW1vpZRkIAqd9E5i2QN2qnkLl/l+wNl8qaC8U2pdCeKIdYS1E5AQRknu0F lpEg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b="TWY2lG/T"; arc=pass (i=1 spf=pass spfdomain=virtuozzo.com dkim=pass dkdomain=virtuozzo.com dmarc=pass fromdomain=virtuozzo.com); spf=pass (google.com: domain of kuznet@virtuozzo.com designates 2a01:111:f403:c200::1 as permitted sender) smtp.mailfrom=kuznet@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazlp170100001.outbound.protection.outlook.com. [2a01:111:f403:c200::1]) by mx.google.com with ESMTPS id 41be03b00d2f7-cde150ca66asi2573141a12.292.2026.11.17.05.25.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 05:25:26 -0800 (PST) Received-SPF: pass (google.com: domain of kuznet@virtuozzo.com designates 2a01:111:f403:c200::1 as permitted sender) client-ip=2a01:111:f403:c200::1; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b="TWY2lG/T"; arc=pass (i=1 spf=pass spfdomain=virtuozzo.com dkim=pass dkdomain=virtuozzo.com dmarc=pass fromdomain=virtuozzo.com); spf=pass (google.com: domain of kuznet@virtuozzo.com designates 2a01:111:f403:c200::1 as permitted sender) smtp.mailfrom=kuznet@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Z+iob9nyyUAV5zZaHsigjqbOUORT5gU9FaKZFok41RvvG47vdL0bF79rbXZU4H5qDfnANUQ/R5SLFVcbaFQy1xe2os4qxHFvFJBu9B4e7vqPktbcJOe8tZFUn5VggFCBjebDiHYM+PIrm+iQT8W4URgGdH8HnaeXydDFIq7MzV083cAJz3fOrEDFbkpyyYh+jhd5Vwe1reqf/vSXHRwQAt2o5P9ryqnh8uy/o3VbxMNKjl60am+zyV83HxDPQ7PGrgcKcoF3Sbl5IrDSdr2HddyJSpRKeMVrVcgcbpFpZMwPsLL9BS5/qe+zRCFaKI7WK9Epm56TaHyWe1Z6RD7R2w== 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=a0cIepCHT61Z6/dL76Qak3v1ATV8p3Us0MCyA2QmX1M=; b=gFgoFUArsWSQwDL39OPBjGtuEmem0ZZNamcJ0NBpefKQCVfvwQFspKMV9dniVrLiNa3ZJVNRKEPwvGYOQMlmXLhiXZT/boald8Oged/SwJqjK4DMhRrfZlcpCCl+E+V+mVAUo4pOgZoKz1dQtj1cMFY1I7zzNOppYcW8ppR7JfbZaCB6AeMNopljj7GDzGELCTK61LcfQgpjEAVDSC6k9xBtCk86U9Y6tGrnCadw6Kw+8BKIPK1jTHpluwmkFaybUMBg5w89J9EqeKayeGAy1TnIn7/5ieMjAhXl6yjdgPkUGMy1hCjpjTIwWlnAQodvfgykkpIgxGeQUZ8ZjDnPng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a0cIepCHT61Z6/dL76Qak3v1ATV8p3Us0MCyA2QmX1M=; b=TWY2lG/TXDE+pfkzeQjG6r4OhAfGALEfpzvRyRtQzx2eUMiYRcoQoY/QF3H69n+Pt6xxnhQNA+ktnrEOSeS5A707Pl4SSbXsna5lfYRnwiRiKuVLvAKeGe0f2ZnQBNM+MrvEKLmyx2P/JTGy9ZPCUiBw/pevu0kHDn6A7NpAq34b80XHjPaqvBEQCpHfurve5oYjWPQLvzbjKnxdVfAFchXby6INmCGGLx85S8zD1+5PQxb3cNU1hi2x0fsGei2kUVXCEvoIMpqYYSWCJ7kyxjnlPjqwbgcDIiaCU5ByOGjLZPsSDjmDHxi5KpdmaLMEyOSJSWN1UQT37BuMUoVxeQ== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from DU0PR08MB8254.eurprd08.prod.outlook.com (2603:10a6:10:412::11) by AS4PR08MB7949.eurprd08.prod.outlook.com (2603:10a6:20b:575::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 13:25:21 +0000 Received: from DU0PR08MB8254.eurprd08.prod.outlook.com ([fe80::66a7:414d:72e6:4327]) by DU0PR08MB8254.eurprd08.prod.outlook.com ([fe80::66a7:414d:72e6:4327%6]) with mapi id 15.21.0615.009; Tue, 17 Nov 2026 13:25:16 +0000 Date: Tue, 17 Nov 2026 21:25:08 +0800 From: Alexey Kuznetsov To: devel@openvz.org, khorenko@virtuozzo.com, kui.liu@virtuozzo.com, azaitsev@virtuozzo.com Message-ID: Content-Disposition: inline X-ClientProxiedBy: SI2PR02CA0038.apcprd02.prod.outlook.com (2603:1096:4:196::22) To DU0PR08MB8254.eurprd08.prod.outlook.com (2603:10a6:10:412::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB8254:EE_|AS4PR08MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: eb05953e-6038-4934-76c0-08df44ae37b2 X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|376014|23010399003|6133799003|261009223027099003|18002099003|261026140227099003|261026121527099003|261021121427099003|261102123227099003|261028144727099003|261022105027099003|56012099006|10067099003; X-Microsoft-Antispam-Message-Info: wDT2aflaqTeLWeh19aqJVh//ypY8FYkkZQTXZBWSy9oxj/4gEGHdF3tz8eMq91G8RgPP3YTapWenszOcJYTWpTzF590eEkD9ViAipNupboSy9axIa5f95zi7jfO8BRTipfN8yg+pXfVOv60yisYlDSAXNgp7pRixGxrJKrkCCxO64UWcoI3TrCDvkJr2Y+phXm4AtInGfqi14GZpU4BjKjfVCBoHreVgTJngf1I8XyV+kwlhMs1zbigSlaGZl+hYdRrLOoXWCB3dhxCXTktM5xzxJEVCLrLrMckVp1rTyld+ztJffbrx/IYDunakBfJu/1w8frOTMkg/44maaZcPRremNIHvnrjS+d49M3788jvpdypDDu1/baDCxUADkfP5MkB4Euu/+FCINynVtc3pUXnKpn/EbDgNNtuFuYqwv7cGOpHclWVJZgrwRWWqIXuPBVplBOyPneY26k1/afkB94Y7ZyoRXvSq8FozU8PbHwgoD5ldhTfVIfiD3EDsza0CSLZgAooopyb8lsF+tet0rYNe5FxWqSEm86y0+Q4F48EeUZ6Id+EyzeuNxY7fMrkChJkWwiP2ra5CZclS9TeU8w3l5Vfgj9bjwXDMuiqpdJZlhTBtILZXhQ+Og3NwlGj/y2dW+2FgJw75fwRnUJGhFpGwRP9J9+YP0jRINMvRFks= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR08MB8254.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(23010399003)(6133799003)(261009223027099003)(18002099003)(261026140227099003)(261026121527099003)(261021121427099003)(261102123227099003)(261028144727099003)(261022105027099003)(56012099006)(10067099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EDohpB1Y1UWE9Ktxoa3/W7oWkVw87WonnAuUfYy7R89NVth+5EgN6VLTv926?= =?us-ascii?Q?GCgOKxP9eSc6vp2v4XwXF+MHDuxBHqu5mHsvM6XaBoPaEITbFct4iqAwGicS?= =?us-ascii?Q?imyji4TfZkfT9ABv8mPB5efZkIomp9CIpBzyvcpiI0rteCtQOgoSbkyVBD9i?= =?us-ascii?Q?QXuRgfsk2wdqPgwME3nL4+wg/IjOsLD3DWB+t3Ss6DOlly6a9gGhemyEKgYO?= =?us-ascii?Q?zfQps78b+NXtGLzUiW+t4bHGhsV37fOa4xiPcqc44xqJKzNhnBCrEW7Ymbwj?= =?us-ascii?Q?/cWmlLkkeDPuZrA+BlQUOg6VFOSCeeak3xoiUeaj8CFDYR0jAGACEcCINM1b?= =?us-ascii?Q?c79XpQsSLrgxF1oVc8eQjlID8URgdn5PrHAnGNvrFQpyno+BL68PO8szGMAD?= =?us-ascii?Q?cG1MnGsmjIHxDH1kw7ebbKubarv8tQElriVZIT/Cgrk7KlSHxHJDNxo1+noB?= =?us-ascii?Q?ixMO1AN23r9vAY38nZaiFpYACld/rfirVLveNSDrUr9Atp9e/tpGH2xElC7m?= =?us-ascii?Q?knRlbXMAs9B5a6hXrAtYO0Gx0tAjTUoRu/8NdpWEvA8t2UgYcGZIAmhnGPjf?= =?us-ascii?Q?+KQ6Ef00iGKN0PJtBAby+skw6w80glC8Zixcv5fIp5p6uYMy7qeBEchqdhv5?= =?us-ascii?Q?bGJJ0s2uU3lonLuLmGNYCur4JprgWJU9EB+covuwD9d9aqPxOwcpS7As8gRx?= =?us-ascii?Q?Y2ykaC1G67D1U9jFs85Grf9wX4VsFDce6as5cdILnlxYpmdLMAZdmhqi469O?= =?us-ascii?Q?WjfmtscDBlV82a6RR7of4FGeSoy0xaDNDObx8wkcUvuazSTpFhW4JLkuRfSO?= =?us-ascii?Q?H/VGvXYydwnKBGNIr276n/LWL3n6NS7UxWfBxTajFBWFnx1dADjd7Q8q5jZH?= =?us-ascii?Q?+Q83nLS5axaPSZy5Nngvj/PNGbpy3Za6b4ICSQPnBs9Eb5pdf3XJW0nKAnW4?= =?us-ascii?Q?E4ZodwiSaBfzy0UMVQUB2DsLrdG1NapOnqANdobHvcASxHonrs88tcN9y2ei?= =?us-ascii?Q?CN1gv54Rop9ep+molVIr5m5jkx5IH3v7DA/DZEaeOP5Y1wWB1Vw2m0oqHSe5?= =?us-ascii?Q?IB/6sAtaqVbgHUHBYtRJVJ8cc11V0Pno5FXf7rqg9IpqOGMX4ItkL3BwNBQ0?= =?us-ascii?Q?6HAvUF0ONDk2C/+JilukXlFqMZ59Yt1gB4s3Ky8iWOV6kpsI+e9BspKrjPra?= =?us-ascii?Q?ZSkEsbkPFEvGL5hqbr7WQdGU2EosZ5rIaFMhSOQeAuotarvt/NaO4SiFQciM?= =?us-ascii?Q?EruLL/IAV8+U3wKYXUI5LLqmHgSp68y7rBa3lk6tlc1cT8n4LcDgx3vTD2fK?= =?us-ascii?Q?NtYOoCngWjBHUzJ3vQ23zm7KRRfDizyu6gySvSY2e0iCIPJKtu7mC/UQFQOh?= =?us-ascii?Q?nq4oxhSrlJn+ZptTuofwaf1oO82jQfs0AU3seIdVlQKqe41gCnAmCtEwl+zK?= =?us-ascii?Q?3+BGLeHzSr8I3iIQSmfX2kKgGCggEyqa32ZRHzCtap3xGWKmtRX3AFNNCK9D?= =?us-ascii?Q?olG1LqsJrqioCjpS1nupbW9qG5F/K6UBOfcvDWHUm6XvpGYJdJQyIbOxxyiM?= =?us-ascii?Q?Xe75B0vfia8FV2NYjKuX1DpdZTKS59WtphC1OHzAUwIfsKaFVfqVVgqrc+x4?= =?us-ascii?Q?PQoo+ezHaP/2uAkuI6lBXnd5O7hmyyUwvuwbajKRL/5qB6b6kAT7ksbmkes/?= =?us-ascii?Q?uuepqGzW/oYZXA1GclzS4NHnTPGIW4qoeXLMV6G2z0fUi3ZllSyXKVBc0lRK?= =?us-ascii?Q?qOUID6WngQ=3D=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb05953e-6038-4934-76c0-08df44ae37b2 X-MS-Exchange-CrossTenant-AuthSource: DU0PR08MB8254.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 13:25:16.2314 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ym8Tq6IC0drPbyxUXcR+Dvv6I4CFt9+0H3YxGba253vGzdZgIg+iiOY6n6vxfw7epBQRg9cr/PfzbCXc5RHoWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR08MB7949 X-OZ-Fwd: true Subject: [Devel] [PATCH hci-8.1 2/2] fs/ext4: ensure ext4 transaction credits while swapext X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org ext4 (like any other journaling fs I guess) has a problem with estimating journal reservations required for particular fs operation. swapext is pretty complicated operation, its exact volume depends on set of extents currently present in the inodes. Even though existing estimate works, there is no warranty under some circumstances calculated credits are not enough to complete the transaction. This patch suggests a safe way to adjust credits in case initial estimate was wrong without fatal impact on journal: it checks credits before each pass, extends the handle if needed, and otherwise restarts the transaction and continues from the last completed pass. The patch is suggested by Claude. It looks reasonable, the technique is borrowed from ext4_block_write_begin(). Affects: #VSTOR-148028 Signed-off-by: Alexey Kuznetsov --- fs/ext4/extents.c | 33 +++++++++++++++++++++++++++++++++ fs/ext4/move_extent.c | 6 ++++++ 2 files changed, 39 insertions(+) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index eca3f0312ac5..6ffee24cf386 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -5821,6 +5821,7 @@ ext4_swap_extents_2(handle_t *handle, struct inode *inode1, struct ext4_ext_path *path1 = NULL; struct ext4_ext_path *path2 = NULL; int replaced_count = 0; + int passes = 0; BUG_ON(!rwsem_is_locked(&EXT4_I(inode1)->i_data_sem)); BUG_ON(!rwsem_is_locked(&EXT4_I(inode2)->i_data_sem)); @@ -5834,6 +5835,26 @@ ext4_swap_extents_2(handle_t *handle, struct inode *inode1, int e1_len, e2_len, len; int split = 0; + /* + * A pass either splits at most one extent in each inode or + * swaps one pair of extents. Running out of credits in the + * middle of a pass aborts the journal, so before each pass + * (but the first one, which the caller has reserved for) make + * sure the handle can afford the worst case. If it cannot, + * return to the caller with -EAGAIN, it will restart the + * transaction and continue from lblk1 + replaced_count. + */ + if (passes++) { + int credits = ext4_chunk_trans_blocks(inode1, 1) + + ext4_chunk_trans_blocks(inode2, 1); + int ret = __ext4_journal_ensure_credits(handle, credits, + credits, 0); + if (ret) { + *erp = ret < 0 ? ret : -EAGAIN; + break; + } + } + path1 = ext4_find_extent(inode1, lblk1, NULL, EXT4_EX_NOCACHE); if (IS_ERR(path1)) { *erp = PTR_ERR(path1); @@ -5993,6 +6014,7 @@ ext4_expose_extents_2(handle_t *handle, struct inode *inode, { struct ext4_ext_path *path = NULL; int replaced_count = 0; + int passes = 0; ext4_es_remove_extent(inode, lblk, count); @@ -6002,6 +6024,17 @@ ext4_expose_extents_2(handle_t *handle, struct inode *inode, int e_len, len; int split = 0; + /* See comment in ext4_swap_extents_2() */ + if (passes++) { + int credits = ext4_chunk_trans_blocks(inode, 1); + int ret = __ext4_journal_ensure_credits(handle, credits, + credits, 0); + if (ret) { + *erp = ret < 0 ? ret : -EAGAIN; + break; + } + } + path = ext4_find_extent(inode, lblk, NULL, EXT4_EX_NOCACHE); if (IS_ERR(path)) { *erp = PTR_ERR(path); diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index 0e8d1366da7a..dfbdb571105f 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c @@ -743,6 +743,9 @@ swap_one_extent(struct file *o_filp, struct inode *donor_inode, se->s_dirty += handle->h_requested_credits - handle->h_total_credits; ext4_journal_stop(handle); + /* Handle is out of credits, continue in a new transaction */ + if (*err == -EAGAIN) + goto again; if (*err == -ENOSPC && ext4_should_retry_alloc(sb, &retries)) goto again; @@ -782,6 +785,9 @@ expose_one_extent(struct inode *donor_inode, se->s_dirty += handle->h_requested_credits - handle->h_total_credits; ext4_journal_stop(handle); + /* Handle is out of credits, continue in a new transaction */ + if (*err == -EAGAIN) + goto again; if (*err == -ENOSPC && ext4_should_retry_alloc(sb, &retries)) goto again; -- 2.47.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel