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 31CAF8017D for ; Tue, 17 Nov 2026 13:25:57 +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 6AHDOUIc009554; Tue, 17 Nov 2026 16:24:31 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHDOUIc009554 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="NDDJl2Ss" Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHDOSkh009550 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 16:24:29 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHDOSkh009550 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-c37b2763f1bso498595466b.1 for ; Tue, 17 Nov 2026 05:24:29 -0800 (PST) X-Gm-Message-State: APuU4Z9gJwhddbcCNuiHyX5QKjUtO3WBdrS8VJ5nBaQxIugn+tvpoogF jXinaFqzUN2Dx3AXhK3z5A6zFd4cTwk0POntJNd2Vk43d5/RxkX0VFfTkOyf00a+w/yCp5MaLyc G7gV90+6+AvHKxYf1mf7FlN//HNZkiMg46XqdcqfwHl/d+MFA5TG0yQ== X-Gm-Gg: AYBFou1GsTFBKivobkrpYaY8WuWSKvclScdQEv0wtNswJ1MKJNNgXmdavamSsXIkKUI Nh2Mc79XtTNjSryIjrm+Vlt/qlg0oyGiEWB3O8VICgah25nCcwcLLI/MQ4j9SDWT+q0gpoQZwwB e2eIGpM4Fx/yuQYVUOXCEV2m8enf/+qFxknyfGDfCO91XHIPq7e5ricvEH7HexnGCiZdJuilqKa ZAO/hMtZVxun0KaGYChsbW6GMIWBGdbzCBTlVLI7f6zKLFJ4wuvjAJyfQ9dv/uktHVHHqF//lhe 96Wo/cpkz9ulXw1iyN7cF/3ljWD5Hrp56mSxMXc3UrdNagZ02NDgGDVjz8ZrSdc1L9FRaxcWXkb 7IcBExTj/wb8dzk0s0k8znWpMg7x0PJqyINpGjx+s1/MVC/qSH5+CwzS0wiMB6xjHgiWLLQmcO9 37zb6f/0GLmrt391so4A== X-Received: by 2002:a17:907:72c8:b0:c2d:c98f:4824 with SMTP id a640c23a62f3a-c509640e213mr1097234966b.30.1794921868482; Tue, 17 Nov 2026 05:24:28 -0800 (PST) X-Received: by 2002:a17:907:72c8:b0:c2d:c98f:4824 with SMTP id a640c23a62f3a-c509640e213mr1097232366b.30.1794921867920; Tue, 17 Nov 2026 05:24:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1794921867; cv=pass; d=google.com; s=arc-20260327; b=LscjXJSaBRrU8oRh7j7GnqbWMkftLz7HhVd9w3QDmhGXnmUATSPFcYPUOnQAQqBUBs +AgHRXoBR9iJdC0TIX5zTDgjqUcIU/JxL293pcZouClQQibSpV6iPbGwBYaAtJ5wtADG KHd5MleB5dYpoiRGu8PjnPBGK6s5Qjw/65JHwWttcOAShkSFwsJSl1NqXylTU2ByjULa reR6bjeaLVNEvMFOzPEjtNhjMqb0mhBuV9kzQugEqWgEbn1fR4sH5M8DwVkwX7dMU/Ax V2NVujY2jE2L/p3a7y72r3vAqFrRwqdu0I58IOXXRzRjfk1ON/hfAdbcSc5sEWbGMbtY OHaw== 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=HDzLY6gyY6ydNCY8PDAe/Pbf2L9eQBoYwGw58IWvrbI=; fh=DHZ2Y/hE6dhVx0UmP7zWEGZ5iFhKn/velJV5CC1BbgU=; b=YYnuwpBHtvRm/O9fXun6OFhuiqIwLzG3Kf/YTe2eaRRmhPcmwgw/054kI9uqqJHE0r XyDYoO3VhIDkDVxLprDY0rzXKwN1ToYppJPifu1DxauF4U+eBjsfsDkvwk6OdnqV0gvz yw5bH6K6TnjDwnX9NULz6+5DmHbS5p4ZkbS1VonqIFKDYuT6faTulZbndBaVEfK7rM1T zvuNUqC6xlIyptT/RP7wV/r1b+zRWuegT7K6ihC/QlasuNN3H6YqtylWsr936eLToH4N 51UxL0IVLL1s+HKOxL/UOfDD4wku6fXm+jgSGloWke2gv2c7J8hAT1+d9Jh6xBc7B31w r3BA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b=NDDJl2Ss; 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:c201::3 as permitted sender) smtp.mailfrom=kuznet@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazlp170110003.outbound.protection.outlook.com. [2a01:111:f403:c201::3]) by mx.google.com with ESMTPS id a640c23a62f3a-c5095beb1a5si981925966b.194.2026.11.17.05.24.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 05:24:27 -0800 (PST) Received-SPF: pass (google.com: domain of kuznet@virtuozzo.com designates 2a01:111:f403:c201::3 as permitted sender) client-ip=2a01:111:f403:c201::3; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b=NDDJl2Ss; 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:c201::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=eGXLRBXh/6oHaLEMSoaVFuq0NrZmqw+8o6il78npa7V4SHpeoyDENtft9akV19cLZSy3Qs5+g0QmMqBL0mi1MsM5bi4A61T6H4X+gVBth3WBrt8cv88m+UhwHjds1EpayJE8heFkJ0nqGe0lWOCvnSyRoUGu0olsZzFRdeHZx2aVF8EiptZFjG/Y7TkXV7RL6g8JG4soiX+To7Z+SYVi4i9XbSFRw83GFSrjYuZGev0x1DeguSIEPpDyirrzTFlmrvZMqlX7nEsb2cLkTm/2EiiQuzAkRLG/q27nvpgTx35pgC/ARdy0dCGMGfN5X+wuDT7KRhMt+g13igVEh542Yw== 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=HDzLY6gyY6ydNCY8PDAe/Pbf2L9eQBoYwGw58IWvrbI=; b=c1ecmKOI1xeKQK+nJCbGbo0y4MBR/WePdfP3IS2r3VQII4mny6eT2ywJ7keieAnia6mDou5mLtAOPWHMX74IpZwboOhmwH05gKCVIcypJD80y8zbgxMjC4HuniSRIM1wta7L9ADDMRM1qPDDp3IQ1eUUe3Cxgsg5bqBjjA+P50nK7lU8GQZYhtmXata+zFx9tqlNtV6Qu8tbVXFewbji1P8fYHvnuAR/ZZxZGnY+oqCb3jWv9acaQf3L9lAK6C2xepX+IatZEOSCPS/QrIh4cQpvmjwSla7Uo7eVTtZrBoqxOAnbq9lfW1ZSaJ2b1xJqP8iAv2x+bEkrXbDesYblcw== 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=HDzLY6gyY6ydNCY8PDAe/Pbf2L9eQBoYwGw58IWvrbI=; b=NDDJl2SsqwzFY+FEl69+WqaxgJZN1dDhQEsL/DpfJamsHJYDxpGKXG7afdNdHc6ohnCkzMf6FCQw01s7yza494cV8jB9RCwp8pFl846/NQKmTXue8QhUrQ/S7V6bsWjXXREigM7zHnTo6B/gLfWfdo4YgxEsJhsgrkgh1cVwsQ5zUrKr2FLDxDdlHTdVxVc191FnDq9GcMYtzcoGJruInFpoCwPkspYAtCzpoBH/L2GFugSbS/QxSV9wXwQ07lSBFOEEEHJZvhLK0ZAmuBD0x7lgrr9383mr+JsSMCnes2vnEZdFoS5dkKsvUv0+2mpOkP0MBOaLP4vxRQ33JjK8Kg== 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 GVXPR08MB380995.eurprd08.prod.outlook.com (2603:10a6:150:3a5::19) 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:24:23 +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:24:23 +0000 Date: Tue, 17 Nov 2026 21:24:01 +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: SI1PR02CA0026.apcprd02.prod.outlook.com (2603:1096:4:1f4::11) To DU0PR08MB8254.eurprd08.prod.outlook.com (2603:10a6:10:412::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB8254:EE_|GVXPR08MB380995:EE_ X-MS-Office365-Filtering-Correlation-Id: 310ca3c0-e368-4c2f-037b-08df44ae1808 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|23010399003|376014|366016|18002099003|6133799003|261009223027099003|56012099006|261102123227099003|261028144727099003|261026140227099003|261026121527099003|261021121427099003|261022105027099003|261021123027099003|10067099003; X-Microsoft-Antispam-Message-Info: Ymcr7pJjwyddpVEYM2UIwFXvf44ufcMy0vRWMPnIT+pGDbZ4POfHI0RzP0n/TIIQiik1oWAyig05aoWahY92EfdHfMi0Ogq+yVjvhvkAea2E7hihtjhCCy/B5oJUF+PT3FzxvnhzNFBqbjpcRofsKIZNYSLWJFlJvwupAfR/kYpvHeans/ZBfE2svMWileOF3l+TlLhzA6fu1uRfHrQpcAIVXkiWZ0VWG2JPGx2fBJH2x8GJcmIiRHFBrUjCC1+vapBRo07/gnKo+oz1/RUtSsLk882VlR6QR+gSL7pKNU8Tee8BFM0dmvNvDRbeVwlnvax1ZM6jWHkwGINSalNftbYbLqw7JWB1+op+XAe62VVRBMbse7CJI+M67gxnpmi1ut0qGGVMNpGzeHCB7bVNn0vAisScMZnfJBccWFkoBfJnG6iuSgrugTWgXHpRVHzII4VTInuKQEKZPxHtuQULTgu0Ui3EIL284C/98O4uaAHoXbhXECR2fT6UolrdfKqWpKqIaTtQFwnPEe+h5I9mZoZ3NBqSxOSs5gZKBP4MMSw0xMgB0sgQWQAtNwjEl0tnlpMaszm2i5dQP/jx9UPcRxeU1xQI6SfYxp/6NY9riWcxEIedlHEI8LpEdM7tRUIjU+ruYgwXJoswcJ3SbBdAJghy3oox920O4isOO2Ljok0= 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)(23010399003)(376014)(366016)(18002099003)(6133799003)(261009223027099003)(56012099006)(261102123227099003)(261028144727099003)(261026140227099003)(261026121527099003)(261021121427099003)(261022105027099003)(261021123027099003)(10067099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Wd51Z3y/7n35rX8ENIUXWb2LySL8wEzyluh4zlA0kP/D6ByH048PaifF3xx2?= =?us-ascii?Q?48cGTnhDMe4C4LegZr9FANOhgu0dpn6dSZXfEEv1TFOEAS2mu9vJhMevuP4l?= =?us-ascii?Q?9vh89mTRZ4eJHtxrYJMLg/rnUA3E6aE5iRNfdHk2+1tqJri1rvyHTJkR9o8d?= =?us-ascii?Q?3xxUhnzggrENNUbcAYamqOsin3gky3NvYzdSfV7bsWgxT8TyjdeB/tBe1knb?= =?us-ascii?Q?GFo1zFcCySi8m4BOLyy/y2gVAYOUuuJnztR0uyl093I6ntalbwR7cm+IEqNT?= =?us-ascii?Q?PhK4j3mVLgnOGVa3eJFe3iQVKFtKeY0PV7zGZ2moICZGAGRcG48KtNYblnUH?= =?us-ascii?Q?4CN4EVsNE4Ol9IrjAyjKjQxTsreDcxWqtQk6SxmpBPVfhg51zGWz9kP1jusN?= =?us-ascii?Q?jlGgjLBxdv3aSKMTkYPMjIc4GfVo8xwxtq/B/XVWCsY38mhDw6HH9TarYF6F?= =?us-ascii?Q?SKVV8WzbCaSbttW0+lp8aBWbikTI2FqMcO8O82Kkea2NlX5b50m2jyBZ7sUh?= =?us-ascii?Q?VZXkIeZdAVdShoO3PGDXG649oy4ioy4wrKU+hsB82m0TDKZtK25p6OJrvy5d?= =?us-ascii?Q?cL1ch/1QgvMj0WYBTgmETByCpUQcI+rnaKYTH4NbqAdWKtnGUBeqgTgYiVGu?= =?us-ascii?Q?SRxlvZvBH4ef3nfcmwYIdT6JfO2hFlqUa1h8PhLpZOh46hftMMjvRwELkPyr?= =?us-ascii?Q?QlpS1gSQmODyGrGMO2o9eRVHPzAS1T0ozohVl44lHv3o7kCm9JFGI6f42ZdT?= =?us-ascii?Q?bp6/20TmbdHIQo75On40+Oae6KiFvquMnA274WXRkQNOV1a3VMxL97zPq4z/?= =?us-ascii?Q?T0/glQSHyFg1QTVCY6S2zvhcUqG2soRbIJor9OCSF/rAODI77v8XnuCk5FMR?= =?us-ascii?Q?5vyHQhFrH6LQjsHtXA1WJHqexsWAjMLThHYLCMnvzj3B2XPrgjAGlu4BomT7?= =?us-ascii?Q?Uuj7LCc3Uqr4AKnc52r59ODW2JCMwzXb45jUpYQcAkeQ3sFNbwyvTrNPVbFe?= =?us-ascii?Q?fQ6EnbYiWcjSyh9BPXkjZwSxGLxBmHEdrt8xDrnlcJjITRZyzquJ979NhPZG?= =?us-ascii?Q?t+wPqcyEBsG9YjxgqVIaZrFIKCsvnOyKm4gY7/LtULyz2gyhUy3vGz2gb8+b?= =?us-ascii?Q?rg6acjFhYtf+u9+9tmTjyJDZ/qG0EmgYTnImpGL6ezwW/b63QNw+nlQ2sJbh?= =?us-ascii?Q?GwXEI8vQCOJoBBikIiyKWmqJ/+np4ANRseCL1cNvu+mdEt5CN8b6eQOxsQx9?= =?us-ascii?Q?GGz4e7ah3V7bRe+evO4delwUwc2ojQpiXTsIhOMoTiMLyJhi8sfLps4g/tFS?= =?us-ascii?Q?bU2UBAlrAtCSaqWFHsvZ6nXFuatve3wGTjC8SlgcUxO0sn1zjVF7a2EPUwCN?= =?us-ascii?Q?v+JceqIvrP5G+k41mF1dorNKnviA/o3wwTN4c2/DGYhEHSVnTNLEHjy0ZgF1?= =?us-ascii?Q?Q2qZa+5SFHEbpfFlhaCk+A+V2Waoix724l6COmsWsmAaDj5m/TY3WNmFrm8p?= =?us-ascii?Q?VSXENPTR0lejxuVMXNq3U7oA+COmlWIpzW5BEJoa5GZ66ZGdTAS16NS6iW/I?= =?us-ascii?Q?PLLknVqojxhwiqvjBSWhsrnf/jfZ2EBaCgbalNnyws+LB/AHnfVDvxrHNum9?= =?us-ascii?Q?52yOLi43RJS3kyTpLWpYYAmJojysAInQITTaTBLr9uOUNDQXYaZ3XLx8Z4x6?= =?us-ascii?Q?zfN6hxzbPwtqhtvmP52U/E/90xjUS57O2jmTkp8LN3g9bvgTntfsWqLH1V8w?= =?us-ascii?Q?Jl6Tn/YYEw=3D=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 310ca3c0-e368-4c2f-037b-08df44ae1808 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:24:23.6153 (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: OnhShnN2hdQ48gyh0LM0tcVyMQfrJMCIjZZnyiqU3784eHLClMY7CfoN4wbKIXFmp0gYn1fAvtWpvo/tUZU1FQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB380995 X-OZ-Fwd: true Subject: [Devel] [PATCH hci-8.1 1/2] fs/ext4: rectify behaviour of swapext ioctl on error 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 swapext ioctl (like mainstream move_extent) has to have unorthodox behaviour on error. It can be partial like write() and then partial success must be returned to calling user. Unlike write() ioctl really returns an error, but also ioctl request struct is modified with partial work results. It was forgotten, but did not affect existing user space csd, because it aborted on any error of this kind. But now we work on better handling of errors, both recoverable and not-recoverable and found this missing element. Affects: #VSTOR-148028 Signed-off-by: Alexey Kuznetsov --- fs/ext4/move_extent.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index f08604816892..0e8d1366da7a 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c @@ -714,7 +714,7 @@ swap_one_extent(struct file *o_filp, struct inode *donor_inode, struct inode *orig_inode = file_inode(o_filp); handle_t *handle; int jblocks, retries = 0; - int replaced_count = 0; + int rc = 0; struct super_block *sb = orig_inode->i_sb; /* @@ -731,13 +731,13 @@ swap_one_extent(struct file *o_filp, struct inode *donor_inode, handle = ext4_journal_start(orig_inode, EXT4_HT_MOVE_EXTENTS, jblocks); if (IS_ERR(handle)) { *err = PTR_ERR(handle); - return 0; + return rc; } ext4_double_down_write_data_sem(orig_inode, donor_inode); - replaced_count = ext4_swap_extents_2(handle, orig_inode, donor_inode, - orig_blk, donor_blk, len, - insn, err, se); + rc += ext4_swap_extents_2(handle, orig_inode, donor_inode, + orig_blk + rc, donor_blk + rc, len - rc, + insn, err, se); ext4_double_up_write_data_sem(orig_inode, donor_inode); se->s_dirty += handle->h_requested_credits - handle->h_total_credits; @@ -752,7 +752,7 @@ swap_one_extent(struct file *o_filp, struct inode *donor_inode, if (*err == -EBUSY && retries++ < 4 && EXT4_SB(sb)->s_journal && jbd2_journal_force_commit_nested(EXT4_SB(sb)->s_journal)) goto again; - return replaced_count; + return rc; } static int @@ -762,7 +762,7 @@ expose_one_extent(struct inode *donor_inode, { handle_t *handle; int jblocks, retries = 0; - int replaced_count = 0; + int rc = 0; struct super_block *sb = donor_inode->i_sb; again: @@ -771,13 +771,13 @@ expose_one_extent(struct inode *donor_inode, handle = ext4_journal_start(donor_inode, EXT4_HT_MOVE_EXTENTS, jblocks); if (IS_ERR(handle)) { *err = PTR_ERR(handle); - return 0; + return rc; } down_write(&EXT4_I(donor_inode)->i_data_sem); - replaced_count = ext4_expose_extents_2(handle, donor_inode, - donor_blk, len, - insn, err, se); + rc += ext4_expose_extents_2(handle, donor_inode, + donor_blk + rc, len - rc, + insn, err, se); up_write(&EXT4_I(donor_inode)->i_data_sem); se->s_dirty += handle->h_requested_credits - handle->h_total_credits; @@ -791,7 +791,7 @@ expose_one_extent(struct inode *donor_inode, if (*err == -EBUSY && retries++ < 4 && EXT4_SB(sb)->s_journal && jbd2_journal_force_commit_nested(EXT4_SB(sb)->s_journal)) goto again; - return replaced_count; + return rc; } static unsigned int count_credits(struct inode *inode, ext4_lblk_t start, ext4_lblk_t len, @@ -974,12 +974,12 @@ ext4_ioc_swap_extents(struct file *o_filp, struct file *d_filp, __u64 orig_blk, ret = 0; rc = cur_len; } + se->moved_len += rc; if (ret < 0) break; o_start += rc; d_start += rc; } - se->moved_len = d_start - donor_blk; out: if (se->moved_len) { -- 2.47.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel