Message ID | 201708071047.v77AlZtX008285@finist_cl7.x64_64.work.ct |
---|---|
State | New |
Series | "fs: Revert "MS/FS/DCACHE: move vfs caches to headers"" |
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); Mon, 07 Aug 2017 12:49:52 +0200 (CEST) Received: by 10.100.160.234 with SMTP id f97csp2640708pjg; Mon, 7 Aug 2017 03:49:46 -0700 (PDT) X-Received: by 10.99.185.75 with SMTP id v11mr59291pgo.189.1502102986663; Mon, 07 Aug 2017 03:49:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502102986; cv=none; d=google.com; s=arc-20160816; b=J0EyfJCb2l26pdkh/mNUq4EGOeYvFPukUo8Ppk1i065mTSLXMtsClvNJGNzuPBQQmM 9PG23P+3ssmk6FnnG6LiQ8lmJpJY/78QaLPY+QDY0iLa9o3erZW/gXGpYpcMnwgRxdsW 6tq9qOnPFR2oSGwuXiSevvdAaw5w5ghZyVDMiav/+uL6BZcduZE8q4PACL89QV1pE0Ze 8NM7hE/CYsEuE8rQWRYlIqk567S/ZpJ2KPe6ZEiVotYpJFR9Zq8eFNz/9Q7E78lgndLB 1hkrC0rpYl9AncBTrot60aES9rzr4NjUxDtf7Fwx2zRqunM9sVxiNT92bY3+7tdZqizD bavQ== 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=wnYj3T8iwIgU2qBPJcWrG26SAUVXT85JoknT/NKNmbo=; b=igdWEormSY4YCTCWeuFFaqjj7bVScyIwdHaeNuyaUm+VAefDlTXSPVoKCnsjkD9v1U XxGB5t7lqADQZqmMVt1+UYXS0CrBbr5hVmdPx02vwYfLNsORTPbxjVWGbGxDeeo0TOKg dg9LzSFI9FnR1dNPrONSY9Rv3jabUePyWlttsorHt1aO8IYx0sYP1KJEbni2HFWR6LRW xjcvwpouoLWwqTQklm9bhQDIy1xqLJSaQ8SOAss4wuhJxUUD2Rw5hAvy8wSpW5PEFhAG LR67auvDvoSovpth4W8OW+KQ6aqxp9FKsUCOnpDX5BH9q9Zh1tjfjKk/9IGmJUI9sVjD EGEA== 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 k15si4440427pgc.939.2017.08.07.03.49.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 03:49:46 -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 v77AlhLq022597; Mon, 7 Aug 2017 13:47:44 +0300 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp0211.outbound.protection.outlook.com [213.199.154.211]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v77AlgZv022594 for <devel@openvz.org>; Mon, 7 Aug 2017 13:47:42 +0300 Received: from VI1PR08CA0171.eurprd08.prod.outlook.com (2603:10a6:800:d1::25) by VI1PR0801MB1885.eurprd08.prod.outlook.com (2603:10a6:800:89::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1304.22; Mon, 7 Aug 2017 10:47:37 +0000 Received: from VE1EUR01FT041.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e01::208) by VI1PR08CA0171.outlook.office365.com (2603:10a6:800:d1::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1320.16 via Frontend Transport; Mon, 7 Aug 2017 10:47:37 +0000 Authentication-Results: spf=pass (sender IP is 195.214.232.25) 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.25 as permitted sender) receiver=protection.outlook.com; client-ip=195.214.232.25; helo=relay.sw.ru; Received: from relay.sw.ru (195.214.232.25) by VE1EUR01FT041.mail.protection.outlook.com (10.152.3.103) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1304.16 via Frontend Transport; Mon, 7 Aug 2017 10:47:36 +0000 Received: from finist_cl7.x64_64.work.ct (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v77AlZhZ032438 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 7 Aug 2017 13:47:35 +0300 (MSK) Received: from finist_cl7.x64_64.work.ct (localhost [127.0.0.1]) by finist_cl7.x64_64.work.ct (8.14.7/8.14.7) with ESMTP id v77AlZlO008286; Mon, 7 Aug 2017 14:47:35 +0400 Received: (from khorenko@localhost) by finist_cl7.x64_64.work.ct (8.14.7/8.14.7/Submit) id v77AlZtX008285; Mon, 7 Aug 2017 14:47:35 +0400 Date: Mon, 7 Aug 2017 14:47:35 +0400 Message-ID: <201708071047.v77AlZtX008285@finist_cl7.x64_64.work.ct> X-Authentication-Warning: finist_cl7.x64_64.work.ct: khorenko set sender to khorenko@virtuozzo.com using -f From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Kirill Tkhai <ktkhai@virtuozzo.com> In-Reply-To: <150158248759.7764.4864029069911475455.stgit@localhost.localdomain> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:195.214.232.25; IPV:CAL; SCL:-1; CTRY:RU; EFV:NLI; SFV:SKN; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:VI1PR0801MB1885; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR01FT041; 1:8z0fqtlNCuHwLnTAVHEp+OB4HtZ2PUV4HItsJ3QHmOPDgGGsQ7fLfAODpAFjwa9WvXCuW+0HGLmXo4cq3cWs8M14TChhH8ZY1kQiRbO5j+MkI9Xtzz8f58mD7Ardj/ovRekcCwKu69MIddDrJO2osk/YW4FEM0dmHh1RCpKklHs119Ujx0jc16HNXMLs5kX2EN/4QhRYR8XXMQq5rOA5KI7A0JXMSqgIZDOHCPd2u4nWrlSnPG2e928o641AW16Abt7dTaDL2fHiqmUj2gb51DQlgHnTtcNVl0rCT3cwxsU7e16wiudagBHq137sTBEt6ytlPeA+LsJGDlCUPp3wNJrMWHnFTM+yNqgMJhPrL5uIxhwzo4JdjLvZ+a6OK3wNhHgkFSuyGflu4Fc4tUn03LHU7SxAWcW4xU8ntvvr6tphL+e8B8r8C+uVkHN+OhiCMcfcSFJSKsEfq1uGMLQmaz/6h1czKzVzrKlYYifc5sjDXn/+0ReYS3ZMkePAWOGuFe7TVO5128xD3nh+4ce6SqooRjeCcO1aYXR6W/vNR4SuijVySE/kAbywXcbiDeTE06/LcBwJz8+svBuzJt2xt+46eaucSYTFQeWjD2K4pWJZS1D6lUTGRm3CkmoGrCxN7U4QVKfaILByFAlv1hF1Ufm7xHSrFt+9tLw1wKo1xwdxrPSbU3S8jI64C7rzH+d3kE1UVnLkBg7qFmbc6+/6Xgh37OuZhNabDUPZQTd9kT64fZu0SYIRZnvIpulhqqf/qSWAR+WHWrwX+SnQizsCUGo1f8TSxPrj7V7sIx5AkdU= MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 510b62d9-0e95-4c6a-a409-08d4dd81b78e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:VI1PR0801MB1885; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1885; 3:u8Mf8A6Z1T1KeUGtbR4NibOjFbazmbSIUnR6sxZB50uP1ENjySSjOG9Cph+bYRCqUbyjqDG91yjJsuME2Z5OpXcczvq20pHlZXN8J2IsyTSgYHeoTyU19FXmDDo3UMUl/roDgK3NuQEILO1solMmw7CzmuNoky7yA1o6+HOHB0FiGoRUTpz/wCfAvJEbFy/YoAlbA0sxol++NJIlbwn8AotbHMhtWVGfqiNIzuqnwuH6CBBOiEtmWMDATnb2Mig4elWV8SLN1NH1yyp6f9bSmUFmWgGmXrtbj04Jjn1sWo2k/lFW0vZ2z47HT5F5odJ0wVbeIsuf2S/RmZI2MNDfLGLpLMbJqvjBiCA+f3vhJc8=; 25:qDEmRkkLzyCbntUT5BX30CbtZH7iPBj4Mq+Vib00ll2cMezXQt/Ibim6uUGtvqsmX08K2+5GZtJnPTgFZtH6NqrL3AT0oIpwL91rLV6JoKiZGENyRKvV89eAo6bClq12AVMA4VzipwnRifiWbLKji4r3HCnbhYWS0jA02WavRtr3+dey3QxJIcGUBwJkzwNELJWO4kUo1qTPkJRcV89CnrFPytz7YUiOSGvcfYpP9ryE+AVU2pM5mMUYe0dcSKND/X+gbhttjZUVE89iwXAdiDhC3B7ecnahsgqio7SdutNL10ihVfY6YWpMyZVRFrxNK/cDnXrwjnwXF9ogpMqgPw== X-MS-TrafficTypeDiagnostic: VI1PR0801MB1885: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1885; 31:J+cfBSK3juNsutVLpwV/cpoBGYNklwThsxR5siy0ZpfgsomYYPgcT3d9vQNJvfzrGcouvnhzdS2uH/4E0KdkgCPs5A+M1SSpeh+GhGn7ZyiS3W6Y+YHFCSXsBWmlnDiyo4z4BM0mjQl+gFx1rUOaUXS/vHaTimrha0K4w/rmazbuSSvCiKz8ZqHZFuE/yZtc9UXguHH2rfk6W+yXYxQdIHyIT9FwtzXlcffkJEWU7LM=; 20:p3ZUVqlRo7Cf5YGaorH2857hKFNJDUtKhDO7NOoDAqahItZ+/kJuhTbII2rOizVh6+bnVOBOra3ZFsZQRDcS10qoDvnlRsBiUizAWydPe4H3AQSXW2i8n4ltNVCobGEC2zSHhJQpqgUn3GvAZYGuvMJXbJaGCj5W62E+/SbipEfe35l8e7LGeJgs11t3/80PXmYZm68BwbqkOM7nXQ+xYLz5OGsFr7fwzQ4Nvofk4Qi8KFlK06j0DcPB2K5sD0r3sM3J2zfpBQvQKWEn9MmNech3AbfGyJWzmhifqb7zMqn36CNw9Cu662sst74rQock84C53R8zSrtzI+7/16H4oIm5sdSvkJwk/2CQN+OLLV19i4/Of+JWbITz+ReKULLoXRxfz4DFn9EFuq7gbr/XlMaxcDN5S7rQWkbUfdo7Xg+VU4+F2OgtIBvkz2iZxL92FU7vvRg2N+gHTWHSdkonHSilrb8MlsmLmVnzwPrnV55zg5Ruk96slbHfCYIfN2Y6RzZrmPURwuJohtVEZ1cY1Q== 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)(13021025)(13013025)(8121501046)(93006095)(93004095)(10201501046)(3002001)(100000703101)(100105400095)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR0801MB1885; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR0801MB1885; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1885; 4:aBoRozUfUh5VphD4fuCMkH2rcUVrToxLsvxKqOUMwCDJ+xl1y59vRQikzPZif7I63gijDmbTsoi1BqO9viFYPcner+K7btipymtFQl9wEIk7wbnVy4FU4714ArzmQfxNOKOrJ8Jrbym8k8MpumbxyVyFNQXC4tFu9HHVdwl2mPMdIdxyBStdEzcCrFG1dfo/v+Q+8GL3QbiF393rxUxSftkzsESEw+G32YPa2qXpOGGbv5QCnmJHz/fqEqvEQJJN; 23:zTcYABWIo05J/R4fgYd2SjZu4sFljgpPzw+SI/xld3wSPiIZBubWOj5wcsq45XCj/C/wuKkKYRiZNW/pcU/T850L2bUb8XGuzVM5u+O0sUQZk6Xm5PFy9ZETXvZbKJAJMe6Y7ksTY1WFmsiPOVo2sAoVTYp/KQy042o1nubGfpTbFErH8HBy5rpgvTHCUslC; 6:LQAEQ1EbCt+ZDjcnWk7FdDl9S5ex1z371VAPV1LD8YjoYt8OPU/oOXbBy2QXrLDXPY+ae/YrdE+SniRox08Gr0A+ht8q5R9bsLgIqw+eYgic62ZqPWmWnlC+wWp5oU3rO9baQZS4Cgej7J961Sd3fj5oYf/qcc4etRaQWvr7AfK5uXBAhz4q0bTl3Qo2Y2Ux/1Zgzx+kPKZm3q3LYN8c3p7dN9wWVSH0evQyetyXR3gJHhFpulffqdj1SJtLQOit0OCj15+d4a5l5H9A4FMNuQqRUi5g1WW2QLvTjbtPb1yyN8zpui9x88rzC97cJ6Qcjh6jl0f4pC8yTBQwsGAk7g== X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1885; 5:1fAC1EL9H8psX42Ub5RzC5EyEK3HvJffnn05P+41gJi7lirnnATnVu3fXjRsXDB/DbicMuF60vcvcAQsEfquEIf9VQ0A+xPey+n1Mdm3mvwc++CqdEu8kpd/GqOmqJgyAZlNpB9hbdIehajj5nYuig==; 24:5ga3Ldnz7RrTLDTa3NDY50zBPjmucMx3/ueU8sjhi7iXsXWOpLS0Z1Ir9Q2YjDqfIf7NhrMQdqg7q/mUUexgMdY4iK3Wjo5YifwMDqK8EaU=; 7:RaXX+LVu8/QiuHJWA7ZJaEhGEZcfruQJ+89RVof7o0XXz2uRedE1sQiIWp+aCjFtvmAIvQVQN540uNnoUV0+N6QXHAdogwAzF1sNiijb20VCB8saY2qZFzxMD7ot7YmqPfLtu8eewnfSgSdwv8tUtj2sKCcvi6vowi1yOtIk4S8PzdPnPUzvZlZOaHJbfc9zq+/VmLNm31WBWuT92JfWlUAEs+lWFwck3lLOC8uFPFo=; 20:4fzIBsdGrUunyenpEnTafax6kYl3A7cn/d7sTz+/2l+8SINz0lJy/AVb4XQHg+O7JLxyV3uCR0AoW3T9yJtzTuvsSYICrUvRw+k0gWxTsqQnUrD4Tg2HbcU7wWxosjOTHHbLw+2vIUt2nHmQXIj8wsndqsMoZ4LJv+F/2YT+5CY= SpamDiagnosticOutput: 1:2 SpamDiagnosticMetadata: 2b2090aae5154f77b71484475de18b04 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2017 10:47:36.2274 (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.25]; Helo=[relay.sw.ru] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1885 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.25 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: VE1EUR01FT041.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-Antispam-ScanContext: DIR:Originating; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: VI1PR0801MB1885.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] fs: Revert "MS/FS/DCACHE: move vfs caches to headers" 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/dcache.c b/fs/dcache.c index 9a8b6f3..aa14904 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -92,7 +92,7 @@ __cacheline_aligned_in_smp DEFINE_SEQLOCK(rename_lock); EXPORT_SYMBOL(rename_lock); -struct kmem_cache *dentry_cache __read_mostly; +static struct kmem_cache *dentry_cache __read_mostly; /* * This is the single most critical data structure when it comes diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 8da0f76..13cb1ec 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h @@ -133,8 +133,6 @@ struct dentry { struct hlist_node d_alias; /* inode alias list */ }; -extern struct kmem_cache *dentry_cache; - /* * dentry->d_lock spinlock nesting subclasses: *
The commit is pushed to "branch-rh7-3.10.0-514.26.1.vz7.35.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-514.26.1.vz7.33.22 ------> commit ca5fda64277d7f77d195aecf61a6ab85519741c8 Author: Kirill Tkhai <ktkhai@virtuozzo.com> Date: Mon Aug 7 14:47:34 2017 +0400 fs: Revert "MS/FS/DCACHE: move vfs caches to headers" This reverts commit c66a040 ("MS/FS/DCACHE: move vfs caches to headers"), which is leftover from vz6 and it's not need anymore. After the commit, dentry_cache will be statically declared again. Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- fs/dcache.c | 2 +- include/linux/dcache.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)