Message ID | 20170421150422.31147.64439.stgit@localhost.localdomain |
---|---|
State | New |
Series | "Fix VEIP object handling on container destroy" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.162.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Fri, 21 Apr 2017 17:07:35 +0200 (CEST) Received: by 10.100.181.168 with SMTP id r37csp325313pjb; Fri, 21 Apr 2017 08:07:32 -0700 (PDT) X-Received: by 10.84.231.206 with SMTP id g14mr16980570pln.152.1492787252558; Fri, 21 Apr 2017 08:07:32 -0700 (PDT) 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 y59si10608961plh.78.2017.04.21.08.07.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Apr 2017 08:07: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 v3LF4xrb026070; Fri, 21 Apr 2017 08:05:00 -0700 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp0209.outbound.protection.outlook.com [213.199.154.209]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v3LF4dan026050 for <devel@openvz.org>; Fri, 21 Apr 2017 08:04:39 -0700 Received: from DB5PR08CA0057.eurprd08.prod.outlook.com (10.166.166.153) by HE1PR0801MB1788.eurprd08.prod.outlook.com (10.168.150.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10; Fri, 21 Apr 2017 15:04:24 +0000 Received: from DB5EUR01FT003.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e02::200) by DB5PR08CA0057.outlook.office365.com (2a01:111:e400:c576::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13 via Frontend Transport; Fri, 21 Apr 2017 15:04:24 +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 DB5EUR01FT003.mail.protection.outlook.com (10.152.4.101) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Fri, 21 Apr 2017 15:04:23 +0000 Received: from localhost.localdomain (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v3LF4MdU007194; Fri, 21 Apr 2017 18:04:22 +0300 (MSK) From: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> To: <devel@openvz.org> Date: Fri, 21 Apr 2017 19:04:22 +0400 Message-ID: <20170421150422.31147.64439.stgit@localhost.localdomain> In-Reply-To: <20170421150148.31147.25224.stgit@localhost.localdomain> References: <20170421150148.31147.25224.stgit@localhost.localdomain> User-Agent: StGit/0.17-dirty MIME-Version: 1.0 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:HE1PR0801MB1788; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB5EUR01FT003; 1:BI4qwciGTfuMhgiekJ5ZsWSUU1RFzeSOFufWovyvr/TEEBAo419eseGVnVSTZWAe+xhXYHOXcBqqemYIHxUm3H2d8oPuqwWQy5RfMh4XXrgUTsMB2dIlB6k8G4O4nrZ5TeFVWiMfyB3VZvbVU5VDrRSEtQw8w+xWpnoXuy8kMliwOZ60w0cuLqrVdt4DRwhDBzUxNKbqNRx4kud2TLaOg141Qa79/fZonY7cELSAteoZBzJ1mw949sLg2+4G6HG7VmXAtV5mvfZQP+udH+MmOvj0sNit7JnqxvyHLlPne754E5fT0Kj4QiGfuRhFOPkYEhSyaz9ZGgYcQTBVifQMNMJo/1nXcmm4fVEOHbs4B7ZgXmFFX7LZIgleTGPy4fDXSqB3QJx2wrDecy2EYJdJMFtxcuT21Cy/IrNsgkNhi/skyWlOOpj+21nAqDPFltmB2/J8A5xRJEufdq0IjEK/Dyf6IxCOBKQ2iTYmX76nRlLrb/8GZpblsv4rFu5OAJ+z X-MS-Office365-Filtering-Correlation-Id: 4857b876-b38b-4971-0401-08d488c7b26e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:HE1PR0801MB1788; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1788; 3:yxMRRB3ctGgXPfqzBZKBYdOVXf7BRadNT9y6AVSkne5YXXsfoA3AXD5ZSBCftIFnMmlAVDFpLJo/38gZjD9crba7NCCpJagnrFYkBpHZKMLdqaJnmm9g05UhyhNQj9sewexDyFB/BZDTVQmro5Wo9r/L5P6cQsEX5ebKHugjdWfGi/vckMwXehbDWkgrX5SpIyyDFnoTitWht0yNtOjjE8fyaIbL9aY8nC2V7NwxB6+9ocxiG3sLXozQm027/XKSqlIwlTKk6b/htcartkLmeeCo8MuO4+5322Ho0tdfTwsQl9okJjQXkONfcCRP4qfP/2pAYV5rpombfEQmpV3qIb45ssjuzTH02EDZ9sPgxR5q/x9vPMoxKofYCaG4QycW1Ek6RFD9V2OdcET0b/nBii02UIr/jFE4JMq9u2AUJCWR9+4pNqdc/vVNv2srxOlqoCX+ef5tSFeIBOg8up7FRK9GxWE387I4ElheDq7kPiLFQv2PrhkrlbNR4DAu48cC X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1788; 25:kEogivs1iPCBZhHNgTr6tL0tpn7gGr7aWIxoZjRZmYFVtBnbUjNkGmy/Ns2FJaiAKmLKymK2mplSMlsK+TW82G+9o+axkIFxtjRE+VydtGRrXs0x3xuKjAayQthVOyfc/ldF3oapW+EUh+o+9Rh0C4dAn6ikz3HjAibjHljvfwgtGwH679u/PMRg6nXT23ErPtc40QzmlpgVDzf3xWKpoO4uS9Jdg2V3aiiB0qlp78zxO2IPxmtoi1/e/UsUpMFjjvoqPiK5b9oR4npjNYZlgJzRXHU49wpbvhNsFQM2nrHYGDxn3j9fs4sc2gRhXii9+6wglPaJxHgHlj41/NgipA/46LikY/rApKow9HTs0I5ImrR0HCIT2o1p0poW48HhXZdAfBjYlG0ZS6rmLyeJrNQDg9kyrINMtqC0fWUf/1bIPyH/kU4PPhV+ptlWquA+Vp6yIMKuHy+QdWLecS3LiQ==; 31:lvHynRW4f3YMbx2Zbv0weHFvy+oprzyly9/mpXySzpSj9GrPsWXdC26GwawpufkLPJFbi9aWHUZ/xFIa/GTk9wBX+dntXp3VWzJmRmaTyLxdUxoNqVvgKb2rQgk7Hd01Ur1sKbbIY1bI1whvEOrUd4wl4MEiXmzu6ChzRWKsG3rftRQr8WKRRPxzGhuSS8oghgpjnUOFaKBtvrYs4QpQinPTktOR8I9DVlfgBwMAKFkhH7iGItYyFbO++BxPe8MTevAh3acCtM8/fGD/K3WL2k7i4NAQ8nn3NfFwSNGNDttMk6QR9RVZePPvrtAgu4jL29YwCwBOH75lEstd8yfCjQ== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1788; 20:111netc9zVl8V3m9FXNIAvf2u2+KR8/XbROhgcD3FCcOhQhi8T3dQigOtWNp7IrxhN+lRZwiSgLg5aMMQ9Q3BzPfv3anbaRzu9R9SpYvdz2pTlG0bo7emYRPAaq8ym+8oqMo/9jt9tDH/7nbM/4aPDriQO5njjbQ/TE4and0rsV7FJXT5vhRqNuz4Jxhd2pfd5NpWP/0SdJ4p5tzTtGbB78HiOvnTRTxFEck4L/oYCSkthIEfjlGnF0GioFdwYcDd4u+Ke+sHxbKvFiyMQnPrwoc5eCi7S9zVLycbfp7ruUX8goRV0BivCbxQA34QGKtclEz0uqIyCzhnn9qc0n855VayrIIO2Gc+zWT3Hsi1wmeXrePqNfoMSpMg0V4T/d8UAc1NBxWlevmZCKXHrIoktLQRB2PpuNbzZCS0GtH0BBMwjBy4fdmj7YLd85rgjpJzchU23LY4VAnimOqeU+odk/B5roUneFoXWsbP1O+TDKtd5BP82zeE3urDQUkHk/kzH/4QaGth1HLSLiedkWRbQ== X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101521199)(601004)(2401047)(13023025)(13020025)(13013025)(8121501046)(10201501046)(3002001)(93006095)(93004095); SRVR:HE1PR0801MB1788; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB1788; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1788; 4:c81gsYET5QJ47rH9C0E9pUY66juNjjvBr7zUbQhjWGXq7dzatHRZQbACkBhPGjZj9nnRbsJU4nVoVPjtJP8wT6iWsPqCWVZw7WKEJkm9ywakjXLhso3imOgqwMTqVVB+QikYWBd9RxVSB3+XbqteyEYO8fl2STHC15WaYm60ooVTVsYCEA3YdNHABtYu4tLb1gcL3B5SfZjbhDPDOmAMemqPeRsTa4e/VNuem/zZeI4AOxFCLfoF7G9qFF8VD3W9XCtByVgFRX2ZrD+QJ9hA/ycfFvTljmkZPxs/1UmMyNn2/XVdq981cRWTP/628/RQqYxYO357JzZj6XRapeTnAulFWuokOvPxavvnP36Bgu7wAf+1S709nVUn5tW9HJfV+Vv6BzDuORozihFQBT++RRvJKsFIBwa/ToJZbihVKnSMASQeHZeYUsdXoq55iYXkd0w52OVKp+CXszaQbRfGlbcdc/91IXks93w+lk0v/bk=; 23:E+XL00AJ7SN/5iT6GOXHP2BgXZEpGVCPUUwjrdqzry9I04uNCrkvn4g5On5Klw1aQc+ZxPp7WmCT1A94mueyOufa5oH7UrFB+mQHsRkVAdcVeT9WQc8LpLkMq/88YavgdnxmswaCF992ZDMx6PLdQzUHgyeORW72WRSlTo7uSX465D96nfH2xL8ytG5CUD1y X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1788; 6:SFef4SQHEw/on/rHIQq9Ul165G625ShPkHvS67GQldLIr4Ch4VfBWoZnYURz0wZ6B29trnG2cx4qhcNteQxZjr/8rJd7i/NGRUI/ywbA1W1up/djhY+xTzoG0Kg6C3XZ0luZVi1T8ihMhtrnhAU0nnK+FYfHpEi/gWCre3CG6gTuu7uHGhOZjOoDkEXBdTqTm+RQ9hn8b2QBT4tJPWD9qHEsDlxnW4ix5pL7peTeYLPZfkMnPjalR7G66HNe3Ov0c9Z0BAWhTBtvTWbL4s6H30GdrO50NNabsvn9OhmYYM2MlXhImbhe746jb3QXT2ZiPKUYXCCZLTSBSTgYjZQEuxStpwENU90ai2pkcT+xRODu7LeWwM40jtrRAPaqBzVh0fq4oCEIgpD/8Vujb0i5sEq7Ub+UMS1hK1+SZSHFvBwlC7zC6vHWjmgHNqklwAS7; 5:5iRt/c99K9lfWMimTayVBzPIV2gGSJ8Me0n+BxFmvTiOA+jyUkbsGpVSOzl9Vr+ZAh7zElh1LueV4EZ+89eG6SlQL6Te5+IUgke0ACxZue+0Za17V3OQU20PgmbTQR2KIhQ+WOXMoalcIpEzwnuBDw==; 24:P4U4jFcIOj7xO0CiZwN2erNzQUH99C7gQXCFPvd3qHGgIqu6Qr24R/K/8TVvC0xRQf81Ef3NxMQticmu4uxqaOg9ExiHfR/F4y2bo5wmxR4= SpamDiagnosticOutput: 1:2 SpamDiagnosticMetadata: 2b2090aae5154f77b71484475de18b04 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1788; 7:deJGQo/WJe4qGphUF/xXK9zmvLA0Nd5tdijNMuQXjn62+mQ8HQVKgsxGEaY3oeT3QxHb/Hlay6wEg98MftArIwxdpU14iJQ696/HjWUETN8FieYfvX3zMR1ztJzsKEhNjIej4CaKZg7DoU43N9QMZ6PfjHUlsRdPtf0zwSC+ke2bMvl59uwhlrv13Rz1vzrbuAy6EMAXLFT/iXREaRcb5+OX3BkpOhwkO/fwccjwe+i2X+8xIEwfH5f+IFcM0DiXwTGtSXclaSPdk7QUJLlDgwa5zMfSBKNkDu4QVGp0ULIu1PdsyIPXec55U73fZXdBf20fcGr0OwAxzACEEYhNRfW2xzvO6yV3M3oWzBpfXC9iel41GMp6y2UNuq/wnqXn/lgGx4uaqVbqD10+gi6Z5A==; 20:HY5ZHlb3zmCcV1NBANRq2hCSrzFv/NWC3VtQpyfohHXff3tGMjZqSEJK4mtkaoUwQMsfim2COLmi59jiU5FrW2Ewrw05Fi6nD1pjrfmJWwEonAtzJK7GqN1rVKVtsaqxN2D4EQ50Z5HliAbNl2qAP+1wMdynN5IfaAcvx/Hnsnw= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2017 15:04:23.5600 (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: HE1PR0801MB1788 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.25 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: DB5EUR01FT003.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-AVStamp-Service: 1.0 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: HE1PR0801MB1788.eurprd08.prod.outlook.com Subject: [Devel] [PATCH 1/6] venet: make veip_find() helper static 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/drivers/net/venetdev.c b/drivers/net/venetdev.c index 4a7876f..a4388fd 100644 --- a/drivers/net/venetdev.c +++ b/drivers/net/venetdev.c @@ -203,7 +203,7 @@ static void venet_ext_clean(struct ve_struct *ve) spin_unlock(&veip_lock); } -struct veip_struct *veip_find(envid_t veid) +static struct veip_struct *veip_find(envid_t veid) { struct veip_struct *ptr; @@ -1226,7 +1226,6 @@ EXPORT_SYMBOL(ip_entry_unhash); EXPORT_SYMBOL(sockaddr_to_veaddr); EXPORT_SYMBOL(veaddr_print); EXPORT_SYMBOL(venet_entry_lookup); -EXPORT_SYMBOL(veip_find); EXPORT_SYMBOL(veip_findcreate); EXPORT_SYMBOL(veip_put); EXPORT_SYMBOL(venet_ext_lookup); diff --git a/include/linux/venet.h b/include/linux/venet.h index dd7d9ff..7562996 100644 --- a/include/linux/venet.h +++ b/include/linux/venet.h @@ -77,7 +77,6 @@ void ip_entry_unhash(struct ip_entry_struct *entry); void ip_entry_unhash(struct ip_entry_struct *entry); struct ip_entry_struct *venet_entry_lookup(struct ve_addr_struct *); -struct veip_struct *veip_find(envid_t veid); struct veip_struct *veip_findcreate(envid_t veid); int veip_put(struct veip_struct *veip); void veip_cleanup(void);
This one is used only in one place. Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> --- drivers/net/venetdev.c | 3 +-- include/linux/venet.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)