Message ID | 202007210445.06L4j6OW024428@vvs.co7.work.ct |
---|---|
State | New |
Series | "Series without cover letter" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from imap.gmail.com [74.125.140.109] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Tue, 21 Jul 2020 06:45:22 +0200 (CEST) Received: by 2002:a5e:a91a:0:0:0:0:0 with SMTP id c26csp2473705iod; Mon, 20 Jul 2020 21:45:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwr6dIOBNISrcD7o+U2JoeqGh6mQ/dhs9t2LYflA69qTZg6+u03PWkwbRqSjeNLFH8Pix8u X-Received: by 2002:a05:6512:3082:: with SMTP id z2mr12729989lfd.78.1595306718723; Mon, 20 Jul 2020 21:45:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595306718; cv=none; d=google.com; s=arc-20160816; b=WtV5HEeHbgli9khy2nNogXfyY178ghxzR6h6vGLX1qFKMME3FTj1etlxaHw7lnb9OY EncfyC3AMVKv4y6Lpu1nY0pP5P2J4KBXlB9keNQU5IBKT/PoREjxoUhcML42G0U0Yli4 1VxVugTyQD94IoKUbuQbAcedMAl2mTvAPZO/yAFt41Z4dizmSFclctrlcbJXbvKboIMC l8wCZpkIMVkjmLN1448VML0INDhENVYeJxgfQIzNNwPOY4kLobnf0fz6oK/uAh9LTwku giJvu8MLrWURJE3OIfUYh2dHl1L43wFDUGP+aKlXgbFGLv5RlgmazXJ2I2NYtUO9qHrm EQrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:in-reply-to:to:from:message-id:date; bh=euRJwyyC+5sdpsei+YoU2+fStZrBUkR3ylhS16rGrQI=; b=NABDj/IVAT8UFb2NEIavQwdwmVIxG7JJCvQpRe8jLAD8Kvvvxcj5AYPdJMMJgfEvVY G1ELBLzvVRuRRAVN2RJErYnkuoeVPj1kGPaZb6ZARCA6ddVEkFQm69Oo7dwSlPvNeYAB abrBgyOGIaK6JAY/8ztacQtbsndlfxQZrzlEpObqyjVaqiXz6iElFz4mwA+SxOlJOQGl 1hc5dM3M45z2yHOvNnCxmlMqavoji2eRKIKbz8rHHTuDHbVJW9SdoV2RPt6O7rjqTAS6 I20wvsAkqWqk7arc1HWLUjNImrdEYlqMJuiOWS/ZnD4GC4yMdASl5u0k6nIBndnBLbUq DzIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id f23si11338647ljj.123.2020.07.20.21.45.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jul 2020 21:45:18 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 06L4j8pT018721; Tue, 21 Jul 2020 07:45:08 +0300 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2107.outbound.protection.outlook.com [104.47.17.107]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 06L4j6Da018718 for <devel@openvz.org>; Tue, 21 Jul 2020 07:45:06 +0300 Authentication-Results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM0PR08MB5140.eurprd08.prod.outlook.com (2603:10a6:208:162::17) by AM0PR08MB3154.eurprd08.prod.outlook.com (2603:10a6:208:5d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.23; Tue, 21 Jul 2020 04:45:07 +0000 Received: from AM0PR08MB5140.eurprd08.prod.outlook.com ([fe80::189d:9569:dbb8:2783]) by AM0PR08MB5140.eurprd08.prod.outlook.com ([fe80::189d:9569:dbb8:2783%6]) with mapi id 15.20.3195.026; Tue, 21 Jul 2020 04:45:07 +0000 Date: Tue, 21 Jul 2020 07:45:06 +0300 Message-Id: <202007210445.06L4j6OW024428@vvs.co7.work.ct> X-Authentication-Warning: vvs.co7.work.ct: vvs set sender to khorenko@virtuozzo.com using -f From: Vasily Averin <vvs@virtuozzo.com> To: Kirill Tkhai <ktkhai@virtuozzo.com> In-Reply-to: <159524302977.71004.8526840048779385819.stgit@localhost.localdomain> X-ClientProxiedBy: AM0PR03CA0067.eurprd03.prod.outlook.com (2603:10a6:208::44) To AM0PR08MB5140.eurprd08.prod.outlook.com (2603:10a6:208:162::17) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from vvs.co7.work.ct (185.231.240.5) by AM0PR03CA0067.eurprd03.prod.outlook.com (2603:10a6:208::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.18 via Frontend Transport; Tue, 21 Jul 2020 04:45:07 +0000 Received: from vvs.co7.work.ct (localhost [127.0.0.1]) by vvs.co7.work.ct (Postfix) with ESMTP id 6FD2380367; Tue, 21 Jul 2020 07:45:06 +0300 (MSK) Received: (from vvs@localhost) by vvs.co7.work.ct (8.14.7/8.14.7/Submit) id 06L4j6OW024428; Tue, 21 Jul 2020 07:45:06 +0300 X-Authentication-Warning: vvs.co7.work.ct: vvs set sender to khorenko@virtuozzo.com using -f X-Originating-IP: [185.231.240.5] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: efb79028-f085-4b65-87a5-08d82d30d7b6 X-MS-TrafficTypeDiagnostic: AM0PR08MB3154: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:255; X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UJg00rSyLcq/qW12Z6KqTH7A2EugWsMJjJUA09i6h5iIpG8xD2zJWCCoXVQrl+BRNNTzokdmAH5H8RfCfs5s7w8YVXsesgc2Tf9cpQ4apkr7R3oEQ1YYoyf7KrYQajj11vS/zrQeR8QRsOeHVplrEbXnkmY3rniZX3lBUFu+PrvclHueyoVQBRYWvCJtOC9e222ptFXh1679J0ym3pb9DFX/v6g+bpIvGNSijm2qjalD9kf+1mqFSBa6ujxSJpFOJhEXLKN74EszSyMhaKizLaxQ+hJ3TrFsF9rHurUHfJ0K7EQH06tdOVk4cVHjjeTImQYIfXSHgBnc8iWytwMfaiwFsqTv6p+XBrdkW5Fkrh8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:-1; SRV:; IPV:NLI; SFV:SKI; H:AM0PR08MB5140.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:; DIR:INB; SFP:; X-MS-Exchange-AntiSpam-MessageData: TK3AnA7v+9jpyHTaVAtjrW/Jw57xqOk+5rYNEDiObKpexVPcVNSPBDlNY07OQ+q4KZ/vA2hduPAEM8vuiN5gEA7oAI/Kfx9sg0BuKE3SKUizW8bUAVfwC0ZPamgeyX6MuSEd2i+EAU0Ak1YA8Wv7Ylca+ReHTxOED200KEHpOh7OUzm/W7Rj5LCgq6S9MpHCaUuJks/i5to1zmZ3ARNWfEWbTQDknRfkc/gJere9CCQ8lnQdsd8//BY7bV3JHVwzmLfGOHyyVuN2DKVahbmsxFCW+GxC5WPWpsxvFAmnR5OUmqJIKYcQsXvznIHmyPTNPd8qREqwWmTS5pl9/aCV7t4EHOrJPcmvXq7H2ZReKo2+r3ZI5sNReE4uHjujqPbwxZ+kYk6Qng554uJ9cuFY5SX+9clbB/heAmcZdM0c2gnIdcux4AO16U+tFkC3YylAWSILozuEpBJeL2qY2+uMPqy+n6vkBtLY/yaGBydJYpU= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: efb79028-f085-4b65-87a5-08d82d30d7b6 X-MS-Exchange-CrossTenant-AuthSource: AM0PR08MB5140.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2020 04:45:07.5158 (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: aaHzsepgMsrs/int3ZuEGSKF5Yi5FFIPT9qQveyMitqsh759Wkwndd3Fox84ia5tr4798x0KcjsTuJ3rSIkgIg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3154 X-MS-Exchange-CrossPremises-AuthSource: AM0PR08MB5140.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-Mapi-Admin-Submission: X-MS-Exchange-CrossPremises-MessageSource: StoreDriver X-MS-Exchange-CrossPremises-BCC: X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 185.231.240.5 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKI; SKIP:0; X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: AM0PR08MB3154.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] ext4: Avoid sleepable debug check in X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index a0f1e91d65d77..bc253a0f177c2 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -518,8 +518,9 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode, BUG_ON(1); } #ifdef ES_AGGRESSIVE_TEST - ext4_map_blocks_es_recheck(handle, inode, map, - &orig_map, flags); + if (!(flags & EXT4_GET_BLOCKS_EXTENT_TREE_ONLY_NONBLOCK)) + ext4_map_blocks_es_recheck(handle, inode, map, + &orig_map, flags); #endif goto found; }
The commit is pushed to "branch-rh7-3.10.0-1127.10.1.vz7.162.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-1127.10.1.vz7.162.10 ------> commit 31072ab3358507dbaf46f459748d39fb56efbd86 Author: Kirill Tkhai <ktkhai@virtuozzo.com> Date: Tue Jul 21 07:45:06 2020 +0300 ext4: Avoid sleepable debug check in ext4_map_blocks_es_recheck() takes mutex, so we avoid it on fastmap. Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- fs/ext4/inode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)