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 79F5281989 for ; Tue, 17 Nov 2026 16:59: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 6AHGwaVd010935; Tue, 17 Nov 2026 19:58:37 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHGwaVd010935 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="wmGzYQIl" Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHGwYrk010931 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 19:58:34 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHGwYrk010931 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-6b879130a02so64739a12.0 for ; Tue, 17 Nov 2026 08:58:34 -0800 (PST) X-Gm-Message-State: APuU4Z9nXLFuHZ/ME/QwNt82dgDmqA0/TGJmeJNOIcLSG1TaWRXZ5MnZ i8TL/IWROXO+KdfNsGzv4byLUpLvziPQCPAd4knmOxpqzIEZT5WeiQ1k8vvg8WWWVp49AK/4OWv TSG9PZPW0A62rZuZEikbDOSeb03qLo8PdfvdCJ2CZ/wGXvxAyOniy1g== X-Gm-Gg: AYBFou2u56Pvi4rKkYhc++eXyRK67zX8uIGErbLgyRC0Xq3rrFXtaxrZ11YxTagz7dC sLOG13oiffJkSQWMMIZ55PFcPNHbxu1Q5x+uwLeYiW/ovGkDXBCdCSnRHLUdTAthT6J3SmGBk6G jf/bvYCEX/tdQHVhU6NvUYInezlJwfh9xaSG/WyZzooAwmkbXqKfyfry/dRvEcPrW7h/vIhPMZt 6IWhmG7P7+YfIfcRf0Y3SLSCXxWzLtoElY7PIU+UprqLMMXvWiyUuxNmFnjoV8qP9fOTdhKX6Oj EpR6hqNqk2mgquGs/UFTjGS1MNuFdmTsxG9Z1QncZsaLEDdtcWZWOqCLGuVUp0hLszF6YfOLr8K o0RpfPXEL48be4f3ht9qkSdAOD1pw6NIRjxsi8OViIABO9RhpfKWOziBAmlk7Rqa2Zhf2crjfm9 mXxOCnedO4dZwpGg9b9DC9 X-Received: by 2002:a05:6402:440b:b0:6b8:5abb:748d with SMTP id 4fb4d7f45d1cf-6b85acab7e2mr2566315a12.2.1794934714288; Tue, 17 Nov 2026 08:58:34 -0800 (PST) X-Received: by 2002:a05:6402:440b:b0:6b8:5abb:748d with SMTP id 4fb4d7f45d1cf-6b85acab7e2mr2566306a12.2.1794934713829; Tue, 17 Nov 2026 08:58:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1794934713; cv=pass; d=google.com; s=arc-20260327; b=jmcciY5HKBAY8iYFfHEFqnjlHrOZet0qRmEZSsLrkK3T6j9R8Sq84oW3qxwZNwDRZ/ 8bFMV5MFDrcyGhSKN/XbrpDwyg34jHhmx3l2HZfk/xcMnQC1NZIggncmWgzVSRWa+/ch cS7PqFz6zpL6dUdaJqQmxyQYZ/ygHF3IxpXjnsBxXyX7gmeY+SJvE4AF5u6aRQWJbm8u C17MDkmCyluCzxv1Rhl2LaK0t8p6XDprVn8ceIuQgt7cK0SWWiSdc1/Btv68oRj1ceLR fXNDc7+pkbE6IoAafNePAJhmjHZsJ32HAQV3oAsWhIb73H6EA93yKc2is9D+fccjNwiZ MFjg== 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=HYlHeA6RUWGS5mmMbdadInwUlNfChhfqVMll68djQGo=; fh=DHZ2Y/hE6dhVx0UmP7zWEGZ5iFhKn/velJV5CC1BbgU=; b=DEF4JrX4F7FiB90mfLSZl3rmj4BuYUobbBU2y/NRkwcwm6ASeYpsnc9QRcA+wRjqOm FuBPeXWeHeMHkYoLnSLa39JhSP5hS9u5FhRR51tPPnz5+11nRsVRslmaGa+lDA4gYJjG x8t+xXzWdFJYMRf7W1ULOItQrhwq6+I8ue6JVWSNe0xRSVD2WUXRFhEEqX0rx+o/3Tn2 hPxyiZWxqXQMNXelTlKFdvsjzJLVP8ZL+ghjiBLxELw/J6LhyK/pp3FhYB7UPnm74Dvv hN6ePka8+17BL2YdeeLDdNqE/neO5jvIVz7b+bvboAjh0pinEx2s9M+pTICUZdIhMu+7 X2Aw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b=wmGzYQIl; 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 4fb4d7f45d1cf-6b886ea80f2si64857a12.267.2026.11.17.08.58.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 08:58:33 -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=wmGzYQIl; 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=Fne6Rtq9hW/5JOL8YMDZpRKeJ9pEucOFNgE6nybCz2gauc1LuoWwf7LqcesYAAThp/zwQB3dHAhi/nxln7hptI0VcjecjbW+GNgQxOJzCUV0zck3h3GAdghxx/UI52ZFkUFw7wC8cd/X5ygE8GnySfoeMaPV9gujEcyc9znzGe8ICwkxZ9mo+Fs8pjNnBt31O/MngR0XkJhQ1dErI5fubiybFvplpba00Tr36ZQlCSDgP8vavALsGfuqLZ1xbe15/gmvIDhgBsNtk1/eq7l8QpOc8zVqSW/peNGOH2tAFpgsnLzGNFCgdwfChZ0kUybH31CbU4rainXfjOrdUc/9CA== 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=HYlHeA6RUWGS5mmMbdadInwUlNfChhfqVMll68djQGo=; b=bQUROJmjMUIUQQGdEinliMchbE9TTfWVD6+cPKAX5jJSpnM86njh+C0QSRVr1/9d+rNtC0IVV2ZbxCZNV3v6Itqf2IMozPIuOibwiI4u9eEfMvprnISXKtANzgX7cXPvUruWZg3qB1irv6O0bEebxivS2mVprwUOZdWfjDEzycD+rnAclLpVwCYEDdq2o5+n29u0lomAOoolC/oKnfo9ai7EDbREAqEt4fjqOYFAn28J1O+ITr9fZdedDb96Qoz7gpyOzZttyLfZshY54W5lNuy0FFRAGCPpnX/TfIHz38NpapXvZs+yJRbPPKMW//zS3nt2t/jEB92fq2FXaFlqCQ== 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=HYlHeA6RUWGS5mmMbdadInwUlNfChhfqVMll68djQGo=; b=wmGzYQIlJrKXis0gpkU3AI+jMG5HNeTPjaS4T2KRLxbgGzVTeC241AItO8By2N4pZYF/3p5mMe7id9jMdyAdxPo6TXKbSKf5WGdRrJfzJbeyorveYPzvZmCSor2yWA7v/9jiZQgmJh6cF4j0hwFmwYWfTO+OzkOzJHoMA2/1RYDv46uRfOE5q3kGhHBXyT57xmqPHZg4PyC6faD6XqZymKwg7XdLLwhIoCiqN+JrLTsJVbakvDiwLLdHU4BwK/YHvlFQA71lpesjcRGxO+D4XG6jccBqo1GgQzx8917vSFPOf48zsSBN6WyRWTQxhS/rJZMyFgsxC9dkbwf3Tqvl2Q== 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:58:30 +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:58:30 +0000 Date: Wed, 18 Nov 2026 00:58:14 +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: SI1PR02CA0025.apcprd02.prod.outlook.com (2603:1096:4:1f4::13) 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: 05401e9d-153b-48c2-7355-08df44cc0158 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|261022075727099003|261022105027099003|261021123027099003|10067099003; X-Microsoft-Antispam-Message-Info: nnt4NmjbLMpM82XOY6zLLmUmSfA6ZVysyXi57aBclN2gnYKX7QyRLaad52zLfVPTvK3/s6J66i8S4/xz2iorKop1WhTgCMt2AHWk8Cppvy9GPLkuV1me/soy2w3OjjB9IBsnkn7XeJcMqMJs6P4ane4ZRR+2Z/rPBmoIA5YMHIAxj4RUuSGHAegGfDvFxzyHW/Es0RiKi0Y6C28OewkwmWw+r/PoSB/OQr1xrfzIoDDea1BTxng2dLQUesWCfB0OK1GYmW+dqXRg/D0FGkBzcgNFyQ8qhILDNj7432jcm5iQSsvBQZyQhyRH8xRLqd0iDb372EIa+bs4g9GbYFkbx7iOGGShqL6pWegHuwKeaNRoOF/F+7NRaxOd5wW4edxBr7GlZk3HFQMY2MwUZW2jN5JNatCElyqIFhGvXarYlxf+FRYXy20pCyokDVNuUmMVrQWfWF/BfQ4Wba4KyAXiMTgjh1x0DA4pTyRppibbBDxlh3og60EL9Dkz5HqKb0tsiqchwtiMN8wqSRUIj0OS8C3knVW3UDXoth4gcPNWydooXJ4qQpM7Xm2I+ZZ8EfJoAp01meGxqQS/v8+/cd/oth967HugRqN9yjrDpOKKSId0cvCuX5wU+43D6f3CkbmF 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)(261022075727099003)(261022105027099003)(261021123027099003)(10067099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VdJncSqfllLnXYS+7pigc2+a/qUDMxftDYeHDQLPhOFLkxRZEaD4JH4QNzVb?= =?us-ascii?Q?XEoghkoIMuGsObwVzUTEcy7pBR2Wjc0OJvhYk/ql1B4X4qVoeS31+d6EjqZJ?= =?us-ascii?Q?M/gJwlv2Ar8GvJggPahc5sW1AMBSOCdlUUvjJwkRFqOgDLAkQr4lkRB89qTu?= =?us-ascii?Q?q79TbpefzfuuIXCJHETidl5UHfwmsNyIggi5u/wsRwaSK7nrWq3zB65ehKH7?= =?us-ascii?Q?19xeM3G/v+vBU7Lv/OTswUqhCNCj685TSjXiambVLDUSCmj6CSgTcrsHMloz?= =?us-ascii?Q?EVUa12ljqurdZfbyirysGVsNLr6mgqhNezw/8NGPz/Ir5wWCDGkhBL6sbuFl?= =?us-ascii?Q?lirRjEUrAx+TZEsTCqTgF8V0Fuvf/ahNV8DcsXLMu8apA7ECdrsJLdoYxWLU?= =?us-ascii?Q?AxYAw3hHZzVwGiISNgfmXUqBHLchCmxyH2sM20xvWV+8t1hswvPiI2bYxR7o?= =?us-ascii?Q?Pt7nKX0TgDoCUd/mh7uD5PJo7KgXQZGHdrf33zBPVYXY/Wc29yQE1+hYrcS5?= =?us-ascii?Q?fLFJeMxw3G01fXUg8shEcDkaJT4SyfpTAElvSmTRl/caye7bCuUcwEjKkKBk?= =?us-ascii?Q?FUU0pFUkVxmDJlMD4vd+2Bsw/HGCB6X//2amN4Xz0+onq41hZOB65eZodopV?= =?us-ascii?Q?L3HJu2IOB/RTN6gCCCnASqDQHaCaie01VSdFMigwc4IvfQh/0q0N3dVMj9P0?= =?us-ascii?Q?x/5qhN6eRcAIkNPenVKXGZKKqCKJNUcYF0Hs8yr3G2c79OQoFpP7xY8Bu+H3?= =?us-ascii?Q?WH+kbhBm6XnzkL/1TLmSjyNGMmvtDA6LoWS7i9DQ/OV2hEJV9CA50/+8PB6T?= =?us-ascii?Q?wPFBjaOFRuX/sSuWQ/zhVrxJjKJaWvHzqAhJx+n8deqnrvIsg5wpu6wECoaa?= =?us-ascii?Q?RnJe4Vh7v0lWx1+lvAIlQwlyJ8wi9SsUVUA3W7cYMLOinNXnD0D3b6Jhj8Li?= =?us-ascii?Q?041+ZxmHK2hv+JkPMRadqiGNz9ZX5ai3rw5ppMQq1VA9ffXFhk1/zJcTjflC?= =?us-ascii?Q?cp5SXnUjkhLOp1mu+LC1t8WDJZpF25OqotRKVmuAIyrBqXvnLyGwELYGdL/A?= =?us-ascii?Q?8z2LAhJuLTnDGFS9LigyFjD1s2sDzylbMmk81iJfEfRc5FarpvwNd0y8jfLD?= =?us-ascii?Q?8AKG1Kjv4N8HYy4u1GWswUBEV6bHpsAMUwZxbI1ltNJen2d1ro4B3wg1Eo7K?= =?us-ascii?Q?ly1h6kbc/OV4MZAvIP1rf41XsYE0X+qZwWG1MGbX/GLNUCRkHyTn9Q4NlPXU?= =?us-ascii?Q?7H3D415JafEr3itiobQJJttFNZFEoCEiDQ7fBu2JV9Os3InmsNff03OUGLF5?= =?us-ascii?Q?bISN3LmefXYAKbiuuGJF8vnAutpSE0FDTabeT/3aTZECf/IE9g+X4g3wCIKY?= =?us-ascii?Q?hlNouZffrHqtGCam9I0cvs1+zGajdUYWUeTthpWVhXERRh27ZRioPuYf5FPJ?= =?us-ascii?Q?tEMril2LKKiuT2buQBWpgm5T0lYdYF3eVfPQs00YZrh6o2WANK7XuuipRQd3?= =?us-ascii?Q?OooJBxN+1JIm5PS0hvcrJPwIZblCgIEdZsv4vD+Za0Hs8jqUcYlyX6IMF6ou?= =?us-ascii?Q?w/EYXOCSXcY594Zvs/yjK+VVRbwFFILVZVO9FOvHAcUQ8k0+GUUpAuIKf5/O?= =?us-ascii?Q?d7UvNZ2YIzK7VZDuUTJRwxOCpGFGqb0yHcKK7b2rZWg6Ydw81YuGHNkpyBeI?= =?us-ascii?Q?c9igu/Id7b/REqLX8Aw9pW+ZHZ7h+d1+dFgNNYwUDuB3c/oVbLe2lo/+7DvT?= =?us-ascii?Q?zLmK1dNEJw=3D=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05401e9d-153b-48c2-7355-08df44cc0158 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:58:30.0240 (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: MHTEDrXfani/TCF+HmtbMqA9Rww4n0sK8aJusvwMvEP4zcrWwb05C+Sop0IAXS+2qyT3C5vs+C0phyvag9iOtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA1PR08MB11642 X-OZ-Fwd: true Subject: [Devel] [PATCH hci-8.1 v2 1/5] 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. The fixed version reports correct moved_len to caller even in case of errors. Now it is guaranteed that area before moved_len is swapped and area beyond moved_len is not affected. Also it fixes bugs: first, when a pass stopped part-way with ENOSPC or EBUSY and was retried, swapext retried the already swapped area and failed with ENODATA. Second, on error swapext left moved_len short or zero, so it neither discarded preallocations of the inodes nor invalidated page cache on the swapped area. Not discarding preallocations could lead to double free of blocks. The same bug was fixed in mainstream move_extent by 55583e899a53 ("ext4: fix double-free of blocks due to wrong extents moved_len"). 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/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