Message ID | 202007151525.06FFPKKN031768@finist-ce7.sw.ru |
---|---|
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); Wed, 15 Jul 2020 17:25:41 +0200 (CEST) Received: by 2002:a5e:a91a:0:0:0:0:0 with SMTP id c26csp679746iod; Wed, 15 Jul 2020 08:25:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlGpKdtJWTLucoTccyBBMP3GpSuuB5IpIvebwDgxVFE5C/LggV1ZuVOYsdgUrVo83n8EiT X-Received: by 2002:ac2:5935:: with SMTP id v21mr1724116lfi.135.1594826737816; Wed, 15 Jul 2020 08:25:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594826737; cv=none; d=google.com; s=arc-20160816; b=MRN06hFcc5KzNP7/GmmVZNm7bvv7aGfc2SniK8SWspfWMaMAK/zAO0dKzmLwM+lSqc iXVBzfMQ2ySRXQEbwNekh2mDNqc5oC0tHa5td07KIUU39sbgp9BF7cwsSga120Mx0zHG cp1i5SY26PrBWMz+mxvDSmS1NaaF3B+qy8uYUoIFn2+PYU8J6WRKIQ76Hgm8Np2octi0 evciKnjlVrqEEhW6DzsD4jWBHe2lplsvVPJ17XH7DORwPDdSBkC3VAFczdd1b25ccHuH 6eqZ1QMiC/n0SNp8iW94mRLVqHf1D9kMscdfGtbmqNdSaRqcSXQ+BAkPVnzbpDt4o3x/ k+VQ== 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=FEqYew71UZ+ghu1Hc5gkgaL0C2hw+0xat05O4IFqFa4=; b=PwO7+JoKhdGzx50YwrEcf/aJHrjXYluWFFm59FF+rHWCat/nVGlDMj3b+kXmWSnkWM Q3OOhmrHf0mVmwUH4EyKUl9PJ2WtXX+xYW5jSC8NrgPbOsYlSDf9DGqbn5rkW9JjpVBK DsB92CHOGjjFrfuC7kWKjVNEtZeGIcZoBG4+p+HHraLyMnD4KgXEZsfdhZigQVS1dor2 IX6xzi014NZbTCVqh9i6JaLeXKkGMINRbbFHnhTiAu7N2p/XI36y4QGIYYJho2A/tobC yZK+Vwpwin4ehu5Yzg4hXV/Jf0ef8JcK0dxOS8ktgxQV12W8KnDUrTPLLYgWrQPjsQN8 YOGA== 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 h22si1401500ljl.92.2020.07.15.08.25.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jul 2020 08:25:37 -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 06FFPJ0v010945; Wed, 15 Jul 2020 18:25:20 +0300 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2053.outbound.protection.outlook.com [104.47.13.53]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 06FFPIv9010942 for <devel@openvz.org>; Wed, 15 Jul 2020 18:25:18 +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 HE1PR0802MB2218.eurprd08.prod.outlook.com (2603:10a6:3:c7::11) by HE1PR0801MB2123.eurprd08.prod.outlook.com (2603:10a6:3:7e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.20; Wed, 15 Jul 2020 15:25:21 +0000 Received: from HE1PR0802MB2218.eurprd08.prod.outlook.com ([fe80::f4e4:ca6:29ff:b5b7]) by HE1PR0802MB2218.eurprd08.prod.outlook.com ([fe80::f4e4:ca6:29ff:b5b7%11]) with mapi id 15.20.3174.026; Wed, 15 Jul 2020 15:25:21 +0000 Date: Wed, 15 Jul 2020 18:25:20 +0300 Message-Id: <202007151525.06FFPKKN031768@finist-ce7.sw.ru> X-Authentication-Warning: finist-ce7.sw.ru: khorenko set sender to khorenko@virtuozzo.com using -f From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Konstantin Khorenko <khorenko@virtuozzo.com> In-Reply-to: <16761310-37af-b456-496d-7b537a518c5d@virtuozzo.com> X-ClientProxiedBy: AM0PR10CA0043.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::23) To HE1PR0802MB2218.eurprd08.prod.outlook.com (2603:10a6:3:c7::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from finist-ce7.sw.ru (185.231.240.5) by AM0PR10CA0043.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17 via Frontend Transport; Wed, 15 Jul 2020 15:25:21 +0000 Received: from finist-ce7.sw.ru (localhost [127.0.0.1]) by finist-ce7.sw.ru (Postfix) with ESMTP id 3174862B5C; Wed, 15 Jul 2020 18:25:20 +0300 (MSK) Received: (from khorenko@localhost) by finist-ce7.sw.ru (8.14.7/8.14.7/Submit) id 06FFPKKN031768; Wed, 15 Jul 2020 18:25:20 +0300 X-Authentication-Warning: finist-ce7.sw.ru: khorenko 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: 050e7c85-24be-4b5b-d973-08d828d349af X-MS-TrafficTypeDiagnostic: HE1PR0801MB2123: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:605; X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VBZYfc+gteuUB7sODxlrVeqhEa15nUQQHZSsyMBNbCQucbs8tUhRMIY0LmJUfTQGss+QfPvhjd4fTkFwV9GQ73cC3tXG07iBFijR8aSBSjF2YocDCe5q3e1i/cDoVs1qwXykLe09Dn3sXpvfAtFNuvZR2+BXF5jDzVu5gV6zzI2Soa/yZDcQO/4B5rX4lzMehUFwxKw4FDWEQgQ/gj0i/vaiqQ8nq5qqlYO0UDj6VzLxNRViNtesXqrDddD4XzYn1oBA/OJuzFJk0j9fwXA8gQILsTNNMPTxlO6bUgzs41NFqFNux33kxyQml2ZvxrBSM8g7Zap3b2ambtE93jQf46kprNwPWGpxDUD7ZIYVwHM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:-1; SRV:; IPV:NLI; SFV:SKI; H:HE1PR0802MB2218.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:; DIR:INB; SFP:; X-MS-Exchange-AntiSpam-MessageData: 80J9Jt0hz7zO5WbrW5GYlyuHDZOrGI9qT6Papu2stj1HPgv6PS0cRTn5gk7WspAjcCTn/IiiAT7eTc+STOeUmJ0wfO2UjfmxqKZDirbEDyp0Yayrybg4jjBjfNgsKt0JziAPeAW8YVeXPQaYiOTi/F4tf1Wp1LVLmppK+68pl2CAes+6aQ4Z7MUzsvpnPxrwGmxE/rsDNlmz7ZFrucN0L1r9HqETuJyzkEYcjLh9Rc7ZT684kcEorg1e2yaxpk5ZLjGLCio/Vx4k3TVwRqQ8LyaVQGD2eiD0oS2q1YCNq33jI9wy8m1f8vFoxeC6BYp9BpGdOe1VThTy6gGTTUmNbwaEYa7pTYK2Kscynjg3m/9BclO06RpWnmSEBasNvkRSw92WK0mJ47ohjcysQXbZ0haXE+kDXUNfzQU7yP7EK8ynPihu/H6gNAij2N95a6fOrumRCy61Nm/O3iBz6wTfxFCHwptatePSE3puycbZA6s= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 050e7c85-24be-4b5b-d973-08d828d349af X-MS-Exchange-CrossTenant-AuthSource: HE1PR0802MB2218.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2020 15:25:21.4406 (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: /BEmT3LHvRIT9uKzj6EYTCbS1oxJMW3haas2R/h/E73rQzwztONriDhYgzFgQWni9RwdCaNtStofhjpgoFWGng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB2123 X-MS-Exchange-CrossPremises-AuthSource: HE1PR0802MB2218.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: HE1PR0801MB2123.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] memcg, bc/vm_pages.c: drop accidental duplicated counter read 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/mm/memcontrol.c b/mm/memcontrol.c index c2713cfd99753..13b9e0cd7b5b6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4673,8 +4673,6 @@ void mem_cgroup_fill_sysinfo(struct mem_cgroup *memcg, struct sysinfo *si) swaped = page_counter_read(&memcg->memsw) - page_counter_read(&memcg->memory); si->totalswap = min(totalswap, memcg->memsw.limit - memcg->memory.limit); - used = page_counter_read(&memcg->memory); - if (swaped > si->totalswap) { si->freeswap = 0; used += swaped - si->totalswap;