Message ID | 201708311518.v7VFIJUH017411@finist_ce7.work |
---|---|
State | New |
Series | "tcache: Manage LRU lists under per-filesystem lock" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [209.85.233.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Thu, 31 Aug 2017 17:20:44 +0200 (CEST) Received: by 10.179.5.229 with SMTP id w34csp2089875ltg; Thu, 31 Aug 2017 08:20:32 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6n+Y2QIcT8YMZql8k1rCJNgPEkMK5XjAcaIPIJ+Eay6ONMrq/fyyd4CHdZWtlMrKsOqEZw X-Received: by 10.99.44.205 with SMTP id s196mr2898307pgs.112.1504192832694; Thu, 31 Aug 2017 08:20:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504192832; cv=none; d=google.com; s=arc-20160816; b=MYKVuHLLsspCTTe6Qmj8mOEcJ8zrEPFf/IxpmQ8Z/ZTHQJDicDhEIKeqtXCSqBZC77 lZt0DT/Rct+12as9WN4oBLgCMhg9Acvf38fFRkYwyVUM34xpQwBZdplv/D3jWMUP7/eS fz8M2o1dmrGK0vHKwufKnz7OetnwX7K4P1/vzlaedC1iV9gMc4F0xrag1k7+i2L9j3ZA /oRsHeuGgZo3etZfr1GbP15Fgdm2oQtdJZpPpqmUgBHnCWzUQxQ2acWXqImy4vyxq09O D1SZYch7y7s+b+DWw8AOlUKxL9etX6OKBr/+YuLIgsBMykzNZgWXIW6hpyGy0jCVLyL2 PlUA== 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:spamdiagnosticmetadata:spamdiagnosticoutput:mime-version :in-reply-to:to:from:message-id:date:arc-authentication-results; bh=kpKrRS9tJOItZF6jUFHtQqnKkXfRhkHl8JTJcdzTl5A=; b=CjQbqIQCB7vA/ztf5Q4P8jCCcgtuIy6lcn2t+S6GsPFu2He8abJGxUgfd5EhE5lf0K f/sslfoKU6NIA8trfWwePaPt0AHJZfxkbMmMbf11RQqZ8VS85i9I86Nf1tklx5HvBuAr qhNhCYZuZBy4rM/q0/99H8IpogiVyijJFqRSTMjXnBI1FjjfjocSnsPMh0vcGhoZp4bm 6LcE32ZKpqHJAuj4FIzVT+USqguE627w8xAkGMAuC41/Qom/YeAAEJv5wRWGG0yXCiZl BYDovxA/BGBrNhzfdNF9sBT9DHj5aD3r6IpW+L0GOG2tX+z/lp2RhTOUiO6DGc6l037t jTBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 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. [195.214.232.140]) by mx.google.com with ESMTPS id s67si6345629pgc.398.2017.08.31.08.20.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 08:20:32 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) client-ip=195.214.232.140; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v7VFIjvd024960; Thu, 31 Aug 2017 18:18:45 +0300 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp0244.outbound.protection.outlook.com [213.199.154.244]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v7VFIaJ8024902 for <devel@openvz.org>; Thu, 31 Aug 2017 18:18:37 +0300 Received: from VI1PR08CA0240.eurprd08.prod.outlook.com (2603:10a6:802:15::49) by HE1PR08MB2700.eurprd08.prod.outlook.com (2603:10a6:7:2b::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Thu, 31 Aug 2017 15:18:21 +0000 Received: from VE1EUR01FT023.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e01::206) by VI1PR08CA0240.outlook.office365.com (2603:10a6:802:15::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Thu, 31 Aug 2017 15:18:21 +0000 Authentication-Results: spf=pass (sender IP is 195.214.232.6) smtp.mailfrom=virtuozzo.com; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 195.214.232.6 as permitted sender) receiver=protection.outlook.com; client-ip=195.214.232.6; helo=finist_ce7.work; Received: from finist_ce7.work (195.214.232.6) by VE1EUR01FT023.mail.protection.outlook.com (10.152.2.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1385.11 via Frontend Transport; Thu, 31 Aug 2017 15:18:20 +0000 Received: from finist_ce7.work (localhost [127.0.0.1]) by finist_ce7.work (8.14.7/8.14.7) with ESMTP id v7VFIJru017412; Thu, 31 Aug 2017 18:18:19 +0300 Received: (from khorenko@localhost) by finist_ce7.work (8.14.7/8.14.7/Submit) id v7VFIJUH017411; Thu, 31 Aug 2017 18:18:19 +0300 Date: Thu, 31 Aug 2017 18:18:19 +0300 Message-ID: <201708311518.v7VFIJUH017411@finist_ce7.work> X-Authentication-Warning: finist_ce7.work: khorenko set sender to khorenko@virtuozzo.com using -f From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Kirill Tkhai <ktkhai@virtuozzo.com> In-Reply-To: <150289510407.29411.5360996688330168691.stgit@localhost.localdomain> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:195.214.232.6; IPV:CAL; CTRY:RU; EFV:NLI; SFV:NSPM; SFS:(6009001)(2980300002)(438002)(199003)(189002)(966005)(2950100002)(6636002)(48376002)(36756003)(40036005)(42186005)(50466002)(106466001)(107886003)(110136004)(6306002)(356003)(9686003)(8276002)(6862004)(1096003)(8936002)(81166006)(5003940100001)(54906002)(81156014)(8676002)(69596002)(189998001)(50986999)(1076002)(54356999)(5660300001)(47776003)(4326008)(626005)(26826003)(87636003)(305945005)(86362001)(4000290100002); DIR:INB; SFP:; SCL:1; SRVR:HE1PR08MB2700; H:finist_ce7.work; FPR:; SPF:Pass; PTR:msk-vpn.virtuozzo.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR01FT023; 1:CaYi6xKGFFVwYrRcaHh+jPvK6qpRT3yzVpTbsbGSj7AIaTDhI5ZLuyrSPfbQ4Tyk9np1qALlwWXzQKVOFKIWNBJH/iS6iKMK2m/zE821jE5QI1PljlOS5FRs9J7Ufq6J MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e5f2b656-1053-4e27-4677-08d4f08383b1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:HE1PR08MB2700; X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB2700; 3:4x9aGc328nEMV9IRMZmOiQSn5E7ulUZbfsRrlsDee0T3o2dvzpvgCFyFHWwJQBHx439m6eimGl51WrLGtTyeU9rYNrXDWJlp/wL5dQ/uDVUaBvz9/LwwIIegsRoaGahaG7aO0DSl1skGEDATsUWduEaQ7qige+zWhx+uxVlAnrc+/75ChTTS06wPODAJRUVN70bVYYOZ7pBePtYYBvWR6CUKBiThpil3wDfIbJNL2PR0RQRfO8G8OxmN1E+SrJPYhKRAaKvxls6cqkUFc8AoEtYTiGw2XyySrR1/YOXCj5EonWVsLUpnvovj2Cspo4sDB1wSiDTnk5y9vNX6lqGOQgUKLrhvY5RSk5kMKFm253g=; 25:KlKqBPDDhB0pysXU/ea631YA+P9WWLEqJLpvgXNI0au43q6hR0kcoqB694NL7XaMvZW8asxhQrb6fj5XwuQEi5JWUQ+tBLXEupYyEkfd8OBptCZuymr6UMsdiQnWwVuL6QdvweTF2NiGgoHYu0AS8IeiJDHeUF0EZZrIDZMcClZUWW+r4ayavE+UfpTRvGq1hr8MbOcquXh2ob1GBCXOa3uYLerPjsKaPCJGnViO6O8YKliqsRQSuLUUHNNbMYpDSy8vR55SRy1iVhG1QxnXQWGsU6X+w2z49rAgBYHbdtzVvmv7G6XWrbCvQx8wM44f12ShC7N0eafXrmyuxyt4VQ== X-MS-TrafficTypeDiagnostic: HE1PR08MB2700: X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB2700; 31:UdjGRJmxYYjkfJJPgg4BSTd81npY9Cs2qswg4XouHy/xM24ACe4KFfTMBK/5hEsLGs7Eww4p0WRCpcVqy4aR4y7yHsD863kIuA559undzJpcpj2jsGheA30EXEo5dQvDWqAQrr7eU4c2+qSmBfm8rTQ24dBREp/TnGMF6e7Kd2+icMVwFV3lvjlsSrqmJxr43Py+dt4CiujeJZwxrR50QkEs2sQGD60NlDshkhqC5co=; 20:X2b0zDB4fVQ+hrlfftIaT31hQj3is1YWxW0pqq02oS/kPH1hpOw5t1dFJO+hh2koaK8U1OHRwdA0yAS4NNweXpt1tyHR3YwiaWUYhEwyVBCEzhEzMXffYMOFcd4uYuoqbpSgKDIkPHbenJjNO/vfIZHpBa1jTB7lQkOki3hMw8cnPwdljzj9MzqSdYYVDyPNf9xfHNlhMccn2Okt3jhjLLrixWeViZyoqrt4wHcwnetX8VV1xGRoi+8TsVGNGZZ9bqjbhL5ZVZV8BG20ufEMJPrno+Od01GBMtCHxsq4MYTspjYSVe+QR1ZLZ88QpOEcRUkzZ35i0P7vQ84BGbr/jiIQzSUUnigwWFfp0XqnSAbHSeQv2Cn6a6vEybP4JB4tsmnOKiBRL+FVy6o0XZi8Rm9HTk/g3kl5uWKoCRFqnhU=; 4:v8mywuMw3Uc6QdnonnWHYjMiS+HxaVEPaE1yy+jj5oGX12+ucrt13zA0KxapFuD0hhjLtQQS8ziJQD6f9fHEzkbJV2u3DRtWmUeHQDuUIG2ND0VL0WJXM4762qB0df/2pBHsFHYUcdDtgStxykg0V8qbsCLjm6eSZJo4pWGsh7CjVullHfyiCgafnW0AnQ9mWHFa50zq+XJEwpwsi0Ju0lDEQhdE0MNDT0C+m3g+y+8W9eqU6ThN84RPKQWhRdv3 X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(9101521199)(601004)(2401047)(8121501046)(13013025)(13021025)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93004095)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:HE1PR08MB2700; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:HE1PR08MB2700; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR08MB2700; 23:cZ1X3Rg1v3i3XKGl1dHeU1xKpE3QuOAd6rXHL0wGe?= =?us-ascii?Q?kBs1MKZIAg7sB9bMtriF5yaWQpp5DM8RC7MKTIKhwUF0xSGtSV2xAj8SCEBj?= =?us-ascii?Q?0rQAT26aNbGmTDi0Jc1+e5BDitLut+Pt70ZFIRAekhha05VPJ6b/YvFubi+G?= =?us-ascii?Q?C4Lx5SqZMOKbcMZHae2TK6O0nYBcCnWbkl2fDBbpZ35BRRFZbA2bPxnyhP4R?= =?us-ascii?Q?8LmNo1Tqdqitkf1JiqDUnjdSnjSTUsRVpZBET2avK9XnstyMg6TeV6iiUKa2?= =?us-ascii?Q?NfhqTuEJYyv/3AxrPvsgAq5NjcHIlOIIKI0YCsFZx1MMiBGeWv7hOHR+wNlt?= =?us-ascii?Q?MICGZR2PLrYvuG6fn9iQ+lEOsQGhEQdQjjfHMbhWBGeJdLF/Lpxt100+l5Jo?= =?us-ascii?Q?0/2L3MjQOzNwH5WnbXgZwJZ9vtBkk3KGCMS7aW4OaZANfAZiMKetDu4PiaB3?= =?us-ascii?Q?+RDmscHJP2hkY/3nZwfLbu4WOjouJKOGIXzlXhc8qDhRBRY755kxYxoZwVII?= =?us-ascii?Q?a2W+h11zi91oOy5TrWM843clUz9MjZZz8k6x8Uzm6UV+J4HFbZGtnfpC/Jny?= =?us-ascii?Q?Jaks6abhtPDOFM+BCPyNL9TvwTTYkwmkuwDvcABoLSf/TJ2j5IYtNCIPKz4Y?= =?us-ascii?Q?kw6PM4Lg1UYZyb/+Ce72Vde85SKIOL035tBloiueW8gygki9L5fbjlALj6rw?= =?us-ascii?Q?RUx2GQO9nfDtiCKOyKYMyG8Qpbm9QCbdG/5IHPcdn3kl6B9v8kHdoaD/ed6r?= =?us-ascii?Q?fxaJveLPFgs91hlAPAx0CPJ7pDQ0S91Xwj5NZcjG+gZhFnrsCtbQ5r23SugM?= =?us-ascii?Q?ibICFEYTa3++ulQ8eu2Wjwx24Rbpo4bGq4gDl9FS6ovGFi72+npHOlqNT4L3?= =?us-ascii?Q?eDXCzBGZBFC1E28AOCTBkJG//Y/+JW8620yQ4dOiz6V4BFRi84FuUJmgh2Bu?= =?us-ascii?Q?p3cL28jt0FfykHP7jsoTPmEjLjJVSmTA413j6B++vMXX9RWfVXJbf3IYNkC5?= =?us-ascii?Q?EZD3ScJZNi+IMk9zRq6sVj/?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB2700; 6:Vg6289gCmLdlXa8rcE/C5C0BSpQYuDrK+5GNhWqfm+r3N+4sngf4Mw7H6SXt+euIpJ9RhdBi0U2ZdLKwxEYM9sLf/IkjP2s5LNIN4CsjzPnyOQ9DlUEbg/KGzQ1yEegK6fqR7d4xjE+cd4i5VZK4BL9JqswumJbHHl6I8CZbHGNwssHf5TZksqyrx55WaABhBfrXWlkuOao6P5ypP8U5dfXo2/9nk/b+xYgwZTxXVSZFzm2vA4Bjh45ISc6bhfcY0N3xI1IZ9gWhUpjIaXrm6mgqm24LWNvQ45RVcnkD3BQ5BdbzijYarzEQ1W3W6d1yy+ad1pgj+ip6j/rw6M5X2A==; 5:UCSKTJEjjywuQqN+lidsR7pFh9rIZpFBx0M2WCO1KGafHfCL03wfUpgW5vb4Sr1wiuZka8q11HHqsvEzyEdW2t28KM6LaY6MUI/e3O24tc30z3DULA59lyrCOOEMcSWwEWcUAMAuuZYmiNTZBjwTGw==; 24:8hWrfcOxIVju439vKKUNQVDPcZrb4feKkQkGom0Ab7CksFQYBLNfHeWAkYWoNsIDm0BAOIbL3YGw7dLCcXlEKNU7lrRk1TUuUSF72JHRJ5I=; 7:vzNmL5dygGiOQPYEvF79h1RrOTEpAGOmB2QtxkZGkmz/riQimSG+rzO2V9Gjjt6mFlhwfw7kj3grbbC6oCXyNwF8RInu9MtQJEvRg0ksMHqshsiHVOzHd4KrYTaZvf85knpiHwCdK+6uW5LJFeheDtRE7eoPwYD7r+Juw6SvEjqoJWVXIoQ0R+tE+DsklEVGMLNSueSaV938P4oSZ2dOem0nKiIagBM0pl0V5wGpTSA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR08MB2700; 20:dzBP5fSCZYsC4m5fCczOxV2cxILO5SquJa0KlSnTCI6+xBw1ZnNUjGFDBH5W6n+BT31aY9ww4r7WruOwldC4ccXKeNyWTl3cwj9zEpWh0eOEo/+LtElmNuS4GuYIgjsCmiTb9NERW0hlcWnJFix8r3hu+lOkkY+vRcUmbWc0Z1M= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2017 15:18:20.4553 (UTC) X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[195.214.232.6]; Helo=[finist_ce7.work] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR08MB2700 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.6 X-MS-Exchange-CrossPremises-AuthSource: VE1EUR01FT023.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-SCL: 1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:NSPM; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: HE1PR08MB2700.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] tcache: Remove excess variable from tcache_lru_isolate() 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/tcache.c b/mm/tcache.c index 0e57ae6..0f15e8e 100644 --- a/mm/tcache.c +++ b/mm/tcache.c @@ -1029,7 +1029,7 @@ tcache_lru_isolate(int nid, struct page **pages, int nr_to_isolate) { struct tcache_nodeinfo *ni = &tcache_nodeinfo[nid]; struct tcache_pool_nodeinfo *pni; - int nr, nr_isolated = 0; + int nr_isolated = 0; struct rb_node *rbn; spin_lock_irq(&ni->lock); @@ -1046,9 +1046,8 @@ tcache_lru_isolate(int nid, struct page **pages, int nr_to_isolate) goto again; spin_lock(&pni->lock); - nr = __tcache_lru_isolate(pni, pages, nr_to_isolate); - ni->nr_pages -= nr; - nr_isolated += nr; + nr_isolated = __tcache_lru_isolate(pni, pages, nr_to_isolate); + ni->nr_pages -= nr_isolated; if (!list_empty(&pni->lru)) __tcache_insert_reclaim_node(ni, pni);