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 72FDB803F6 for ; Tue, 17 Nov 2026 17:00:35 +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 6AHGxNDn010952; Tue, 17 Nov 2026 19:59:24 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHGxNDn010952 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="F46Te09I" Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHGxKE1010948 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 19:59:21 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHGxKE1010948 Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-3b191f8a9b3so6301722a91.1 for ; Tue, 17 Nov 2026 08:59:21 -0800 (PST) X-Gm-Message-State: APuU4Z88hlN1Jkj64K1x/bg0H7n4YNinO4z2Viy3Kmo1E9dxwptCiW3v BQSAW/+3gS6O2T7fPW2K8JdwRjUP9S8+3FX0clmv/1xATicF4UCuGJRnOwSCgKe/elT63yfOYWm 4gLt04OPGISWg7ga3/1FhWSnDf+CxIpJK0CG2Ygc2lkS0Mlve3D6o9Q== X-Gm-Gg: AZFdTZestsktzfskvGRsgK1kKxjv+/tLDUyKnPa+eH67JZyo08wHQoyJDhKPfm4tZOy 9GyrqeoK1FNscVfGhfQ0ON9rPChIEFRORQAa3pbHAYgNf2BpBzBYas3m1T/a9JFaYcHT+dhGHDT wFQ6xhXdsaVOSNPBmhu3QAZ977NzkrjkaE+0juhDHkE4AVaBPtmgnMiPOcCKV9s53VUzPvqO4UH ipvPFVff4/txhZGJsxEprYkrMtgoYYJGCTUZkyf7jZvz/aJREdr/8i87gqXsW5Ik0+MuPMqIEDG Ay7lqXN/KN8Pv8s0MDOXHnRKJ2L3/uwRTopnOBmauWkjePDEBEr/fys7kMgB9XEAp9lWb/D0zFf +fbHhINdNmX+eCCnSCq53sVG6rphfqKMdwSkAcQksMhJZidEuhB+yOrnRVa8iOsxeTUd5qCk/Kk 35quqybWJh5lJExrY6iJM= X-Received: by 2002:a17:90b:3812:b0:3b3:886d:621 with SMTP id 98e67ed59e1d1-3b3d076600bmr22308a91.34.1794934760099; Tue, 17 Nov 2026 08:59:20 -0800 (PST) X-Received: by 2002:a17:90b:3812:b0:3b3:886d:621 with SMTP id 98e67ed59e1d1-3b3d076600bmr22282a91.34.1794934759598; Tue, 17 Nov 2026 08:59:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1794934759; cv=pass; d=google.com; s=arc-20260327; b=eetyUtwFqkYvY6mY6Ml9mIfl47LpKa6jgAzZD5RlE6/HKpaX0nzerOa/m/Tjrdh3p9 YmN4v+tkS5MF+wFGe72RWOnKTeO/zlVwjEftrvC81BTuqMHDZzlzqCgky2qlCpYxofc4 SzRRtLkE3sI8/aJnXr5TTGb0sNmqJmsearcQ5horFO0L+Rj3MjvnTuWMIXyhEVVqum/Z utvAQYCRWOp9k0u7by5kQ565nDyl5+aHO2BIDZaoxkgFuc+LcLZ9C/UyEEJhC4qJJzhm 6F9q/LnN1Atbw0dRklDaOJmNRyq9W+Yuk8VPpceWuW3TmhfWIsBHBMXzzjjvLnMDhz2K wxZA== 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=Ae7xmflwe/GI2Q3zQ816rKf7B/WcCqQIeibOZiScaYQ=; fh=DHZ2Y/hE6dhVx0UmP7zWEGZ5iFhKn/velJV5CC1BbgU=; b=A8Jf3re9ixHFH28DSepo+2u/RmTth5S7EfMhRLjM9DXb3tuL36GnB/Aey1u63lRmIG qvgp28mrDE73Rjb+Lgp5jKOU50s7XDmQIChQDze7ejZGxQ5dpiRmuswurmXh8BMsAoBo CurhUCr2C4vmaquMLu7uo/pICeLW1wWLIRnhDF46X+g/bwdwI3iS0ivsUt3f8HBnE0HW vovYrjKA1O/COPEYRye9mysvsWILuMU8BRyA4ScMX2GeTElNhQ7MtBFuR4TB7CW83fVu TY4QeouDYrHVaOwHWFgxOpayfF75Sn/K24jAZ+8OrSgwkx9iumzAlcpzPisTzfwz2KXw szUA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b=F46Te09I; 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::3 as permitted sender) smtp.mailfrom=kuznet@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazlp170110003.outbound.protection.outlook.com. [2a01:111:f403:c200::3]) by mx.google.com with ESMTPS id 98e67ed59e1d1-3b3abe4304esi7363579a91.10.2026.11.17.08.59.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 08:59:19 -0800 (PST) Received-SPF: pass (google.com: domain of kuznet@virtuozzo.com designates 2a01:111:f403:c200::3 as permitted sender) client-ip=2a01:111:f403:c200::3; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b=F46Te09I; 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::3 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=SWksHno+Q5htPKvnykfIZIT5GcEygFvnZN+L4+a2EaMGEAoaASTmhybAu0tERidvQXnSIYs1tIajBXb5RUSQ6t2lphkdCZpuE+E69F/bP/c+Fr1Iq6D3KMJpC3zEQDhMHd3VS3+yxegI+nw3htDPaSUPlWCt/PuGXTUUCb74tWfUKbdNVNhOAi8GodCOD6LrV67j1QOWN//PKiA3BGwB6k9KNAxxNvzholNVce5u6VveEVL7Uj5GGCqKL7Tk8pz0EgzMTZe1zIx2oTreMYa8bYm6+E2m58a1jDz3BXaGrd88bl1KWZ6rgD0aFrWp+ivjjrcjP4iQKD/umv5zOm2f7Q== 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=Ae7xmflwe/GI2Q3zQ816rKf7B/WcCqQIeibOZiScaYQ=; b=IV7torVKXs9gT4A1F9E+MG90vUX9NranAvEc+tAf6V0vsqUKnpmSMU8BGlJP3GSsfX5qI7/DoBMQHP8LgxEyi7e7ldhDsKjs5/Y7aTet27ulNnYKgxa+bkOnHZkWAouJ4xtrdINnPHYqj33hCGyzZ2me6oCLDtYoIJxXa86ypsgGW9ZGsSyy32isttsEy7evqzmQ5D4KGsFKYck3vm9ZpkjKSmvdTbOGHVL0D0evJthr3C7Tnm3HOr1U3KsNc8VcqSBOigOI3gLB6laFOdc6OM5y10XhCsRn+fPvSYSXKYdLAq4DfQB2dft0X/JC2OHVokMWd37736jUd87K//wJCA== 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=Ae7xmflwe/GI2Q3zQ816rKf7B/WcCqQIeibOZiScaYQ=; b=F46Te09IQHtC5faJ+56zFCC+vio7bKOX9Jz/af+A03+9X2FNoITvIYOFSk6ctAy5sMwKHCR8VUOvBu/82tzwKp7Rpodg6Fpps66IZ8o3dxnfaDqy8jhO2feuHX/1D2eqGjhAeV8PfhewNV+gNBtEBECw9b4EYh4VSF2AZsRofHRkPWFQQuqsw8MQnd8T+U/H+SFXI3e2ucTrgk42Y5wTsfAtTeu17X6tbQwOBFXtRtuicmCfsYUXhSjZUUm3Yvs5tcKG59zB5qmJJ5r8zfaGK35gGaiCyBuS6hk75/griDsYvQELW5DIYDN9ivKOFKMBnICb24HCr09oDAH5qUe6Dg== 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 PA1PR08MB11642.eurprd08.prod.outlook.com (2603:10a6:102:558::18) 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 16:59:16 +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 16:59:16 +0000 Date: Wed, 18 Nov 2026 00:59: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: SI2PR04CA0014.apcprd04.prod.outlook.com (2603:1096:4:197::18) To DU0PR08MB8254.eurprd08.prod.outlook.com (2603:10a6:10:412::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB8254:EE_|PA1PR08MB11642:EE_ X-MS-Office365-Filtering-Correlation-Id: b0033959-8b8b-4519-fc0c-08df44cc1cf0 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|1800799024|376014|23010399003|366016|18002099003|6133799003|261009223027099003|56012099006|261102123227099003|261028144727099003|261026140227099003|261026121527099003|261021121427099003|261022105027099003|10067099003; X-Microsoft-Antispam-Message-Info: hHdx3PoWMbtkU4oIbAzMoJQTPyK4rQ0p8E2zYPeLezS6qluWEDpuyuDNiEHec3WVx78io21VlVKI5HtfO0jbNKncen697mK2gkAaMxtMH4RB4EQTTRQBl2qicTQ2m+wl3/LkEaXmD0rpC2k1ei9SQQ6WhsPHxLmC8RSzuTD4Osn1JSto5tW+hWIq7OsL/fXjKJImU/I9REgay5PN1d3cuqxOSpkZbkomu5A6SdickWtvqXD5TZrjqs2NOnWWDdGc/BEQ7/q0+ss/KvUZhkhtWOcFe2FVFtB91X2jyJg0ib4BFor3me9168XCdgfTJTF8/JmzODnwdzg138fQFEZ6GJbo+TLBGPkO07lp617cPE+76AAI9FjqnRSZd4KoYnJRuThQqDWOkiAP3xuGoiA6vdcxX5Qw92mKZfN0DspajW7A/PQm7ZZn76i1rz2WYk9jF1GpS1nU+rqgzZPaSxzFDkVgsYk8lIX89YEoA0vSW9v05I+oNCSn6YBD3141LMmyAVDTgIRKbM4HEMMbP/DtriTTPOmLVkNOC3RZ+xagPietzSyw/eX6zNt3uYIHqlawDhYZihrHi1gWEJsVgC6zIHvVTZ8C0Wb95MatqX0MSGA20BvUHfplvFwkvxno55dP 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)(1800799024)(376014)(23010399003)(366016)(18002099003)(6133799003)(261009223027099003)(56012099006)(261102123227099003)(261028144727099003)(261026140227099003)(261026121527099003)(261021121427099003)(261022105027099003)(10067099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?25OyWGSEDEEzC62HsNNwlTatq39wM0v7epvXQ4tZs6Fjhg46c2KnC9j4+zIy?= =?us-ascii?Q?vTeuRr4ejxWVcVE1FDvU18wTh0cHF+13HaRLw3VIdSs3aq3wByski8JWtJxE?= =?us-ascii?Q?SoU7mxtWVomQgkySdnJDriyjIhR4N6bzLpE9n0xRO6gZ6jfyygoy02++wvCo?= =?us-ascii?Q?HDWBaxINkb4SHc+wPz48m7aRalYrhEpXZ/dIBN1G+BgEj7ryIivb2vP186ZY?= =?us-ascii?Q?PsisDT1EyI6MrVYt3gQjbkfxMtcsS1bNF3JONBiITGiAuGzeCr5ywfGaJBoU?= =?us-ascii?Q?iqR9jYtSDvIJ41Pm2W8zXyTLzoJaN44B9Lug4SE087QyUgcKCYtmJbwneFJ7?= =?us-ascii?Q?MWs+fFVGvtuZAW5jy/3psrg0muUmbJ7VMzgihNM70VUx19fkcih2bje6qkRN?= =?us-ascii?Q?Tq6dGPM1bTBSNjRWs3gVnxpn5QxQwTR6nfPp0KBfjUdDIdbp0haYQqaDxHln?= =?us-ascii?Q?32+Qizi9WQKdrpzYcymdT7Swq1gB6HUT4LxWNxOt9SBQVki20XpOTgW2y8lZ?= =?us-ascii?Q?Q3uu8MQ5vK20HiXMPdpunBaqwBCNr+y1tW4C30+qBDRyt+pWAqXD3gENQyj0?= =?us-ascii?Q?R/9Dw1YDA4lInhmzYNLYMEB+9qK9ApY3k7z9fJNAm0CPB0ilwDvF6Jp51FUV?= =?us-ascii?Q?7ISPk1jKGecpEsLwpn5CN3Kzky+YfG2HYAkH51M7ZteKuRR9ByYHPLc4f3dF?= =?us-ascii?Q?VKHeIfOWuwGDaeN9LhQoHvPjIOIX7sHWxHuVpMoswZ+7v/8nDksxUezEv52Z?= =?us-ascii?Q?AojWHdCF15rD7gTE2T9ADS0Aq14LFU+V+UIOWxr2GeVY4ZfvdiEYS5KKpxkK?= =?us-ascii?Q?MoMABpXs0+HGBjoZ3pIpVZpNh+wcU2QIp6bzfPjL5rWgLR0u6WuER3JxlZ1U?= =?us-ascii?Q?G2qTGqjtYkEP3XuCO3AWvyjswPEiXOiFP7OSTSpPA7LLjReYISRgkFDn7V92?= =?us-ascii?Q?27ROrwijC36lQGX1smSFsB9fdkR0CU2FwG61T02cclWVaMiQm5i9BIJmyJXs?= =?us-ascii?Q?q00TI6YojjdwCE0vrpsaVO4k2gcJVx2J17mz8bLrawt6LlVV9PyB2wxV9BbE?= =?us-ascii?Q?tA1OAWdnCeqhea9lESom2Zkr/BzZxWwlaXlgqZn1pwpz8dR3cjie4rLeCiF/?= =?us-ascii?Q?JIEyGF1mn4ZvYN6n5QhDY/HqtPvTZwL37V4pOMrQkafjG60UT2srMxXuVS+J?= =?us-ascii?Q?GNx8FL/ClPRVsD75X7V0zJXufk+Ijo4EW9MB5GMkVg+bpJ4fI3nBBJrJPtYx?= =?us-ascii?Q?WXm6UaTugYaV+mf+IaqvehTwUi98gQkOK+MzwcLrx+JGhMOrO8VVl52oMpr/?= =?us-ascii?Q?vCR2kZ2/7z1PDO9fiyyjgn1Y/iMZuUmFZbUBuaIdLkYKp6f9qx706Fv34ZVD?= =?us-ascii?Q?gzmSjjK3NRm3RkwBRDsN2CwhpPFLE6FiyuoDQPfJwxzKcMjtHHQn+GDEB/aF?= =?us-ascii?Q?HWj1h0+9/Nvr1DtesExMtcmjO6cU1IwGwWgHo7qCyOj8eAiKTQgBgafQH3Zy?= =?us-ascii?Q?kFvRJdHxnMlNsUvy1UqWxQFdfHmOscEcu39Ody9SBp1vrzo3MIrjeG0V8eIc?= =?us-ascii?Q?hcGps8CGDlbh4q7tAXVIO1DZmv2JAHJDNed6pDGYLCPtBwTuMs8anjJKs/FS?= =?us-ascii?Q?2wNYC5TEp2u/PIQO+1Rrf9HjuOM9KT69wEoxTwkVwK7ZV372WnUDuRzjUh4S?= =?us-ascii?Q?42OKQVHEDbVzUbf2J7JpL8j+Q1nvLyDMNeraBMNU+1ef/yAqZ6Q6U0+l/M2g?= =?us-ascii?Q?enLuK0aO4Q=3D=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0033959-8b8b-4519-fc0c-08df44cc1cf0 X-MS-Exchange-CrossTenant-AuthSource: DU0PR08MB8254.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 16:59:16.2743 (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: 6owiOelv1YQqIGnwpgCkCNmqdGGzvPdNii/VtLkBF+GgWI6cAIJBmDx5VPbr5vyD5FYWJkDgqpVWqRhevyADvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR08MB11642 X-OZ-Fwd: true Subject: [Devel] [PATCH hci-8.1 v2 2/5] 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) 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. Credits for the whole request are estimated in advance from the number of extents in the orig range, but a pass may also split extents and grow the extent tree of both inodes, so a fragmented range in an inode with a deep tree can need more than reserved. When the handle runs out of credits in the middle of a pass, jbd2_journal_dirty_metadata() fails with -ENOSPC, the handle is aborted and ext4 reports "journal_dirty_metadata failed" error. With errors=remount-ro (this option is required for css) the journal is aborted and the filesystem becomes read-only, with errors=continue the half-done pass can be committed partially, which is metadata corruption. 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 (the logic is borrowed from ext4_block_write_begin() which has similar problem), and otherwise restarts the transaction and continues from the last completed pass. Note, swapext does not require to swap the whole requested area. It is allowed to swap any partial contiguous area, provided moved_len reports swapped blocks and blocks beyond moved_len are not affected. Fixes: 1a3d440e7fbc ("fs/ext4: swapext ioctl") Affects: #VSTOR-148028, #VSTOR-100610 https://virtuozzo.atlassian.net/browse/VSTOR-100610 https://virtuozzo.atlassian.net/browse/VSTOR-148028 Signed-off-by: Alexey Kuznetsov Feature: ext4: swapext ioctl: swap range of blocks between two files --- fs/ext4/extents.c | 34 ++++++++++++++++++++++++++++++++++ fs/ext4/move_extent.c | 6 ++++++ 2 files changed, 40 insertions(+) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index eca3f0312ac5..58d3acf6646e 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,27 @@ 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 the current lblk1/lblk2 + * (the start passed in plus the returned 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 +6015,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 +6025,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