Message ID | 20170301131745.22606-3-ptikhomirov@virtuozzo.com |
---|---|
State | New |
Series | "mount: handle external mount bindmounts" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.199.109] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Wed, 01 Mar 2017 14:30:19 +0100 (CET) Received: by 10.176.4.85 with SMTP id 79csp1050364uav; Wed, 1 Mar 2017 05:30:14 -0800 (PST) X-Received: by 10.237.42.194 with SMTP id t60mr10116732qtd.269.1488375014582; Wed, 01 Mar 2017 05:30:14 -0800 (PST) Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [199.115.104.192]) by mx.google.com with ESMTPS id k17si4214008qtb.163.2017.03.01.05.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Mar 2017 05:30:14 -0800 (PST) Received-SPF: pass (google.com: domain of criu-bounces@openvz.org designates 199.115.104.192 as permitted sender) client-ip=199.115.104.192; Authentication-Results: mx.google.com; spf=pass (google.com: domain of criu-bounces@openvz.org designates 199.115.104.192 as permitted sender) smtp.mailfrom=criu-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 v21DJX8P027457; Wed, 1 Mar 2017 05:22:25 -0800 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 v21DJVJt027443 for <criu@openvz.org>; Wed, 1 Mar 2017 05:19:31 -0800 Received: from DB5PR08CA0070.eurprd08.prod.outlook.com (10.166.166.166) by HE1PR0802MB2507.eurprd08.prod.outlook.com (10.175.35.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Wed, 1 Mar 2017 13:19:30 +0000 Received: from HE1EUR01FT051.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e1f::207) by DB5PR08CA0070.outlook.office365.com (2a01:111:e400:c576::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12 via Frontend Transport; Wed, 1 Mar 2017 13:19:29 +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 HE1EUR01FT051.mail.protection.outlook.com (10.152.1.71) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.933.11 via Frontend Transport; Wed, 1 Mar 2017 13:19:29 +0000 Received: from snorch.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v21DJSCl000295; Wed, 1 Mar 2017 16:19:28 +0300 (MSK) From: Pavel Tikhomirov <ptikhomirov@virtuozzo.com> To: Andrew Vagin <avagin@virtuozzo.com> Date: Wed, 1 Mar 2017 16:17:42 +0300 Message-ID: <20170301131745.22606-3-ptikhomirov@virtuozzo.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170301131745.22606-1-ptikhomirov@virtuozzo.com> References: <20170301131745.22606-1-ptikhomirov@virtuozzo.com> 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:HE1PR0802MB2507; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; HE1EUR01FT051; 1:i0c7E6EnSvOknFUb/66mkR18rw7No0iLrphB8AUIlrS8WX7qVBHSqHduVQVJFTurFctZ3BFu1yXV17kBhqGzyGuO4qnN3wpyeNJgl+VLCvRXABTrgULVSbXfiVYNTzaMPujutPN8gC7wwF0LycI1eun7TrbwPdgVjNtkOv+lVS2i7PFdmcG9XfYRfNpqBC+f4pBJV4nd3G0EbLrD8mFbDX//BhKsZYXSPQohv/l5ob7rEjk3aRPRDh2+y9Du7a6KFmH1kld4gd+p9v6kr2CQGIQ2faYlr2IOdK53M6lQB2uMOlH6OB6ehFY+e7D5orD7iypvqhGooU6v9laLPa+jOuJK72gbvnWmsBtKr20q+9YWaHGPt3bxOivoL2/onL0adeSsMnZ+vGrb/ZxEfCyUkdnnVOiR7Z0qc8SeQO5mPNJvHeWrunOIIm2hwHcTPmevi/o+Qe570DuooDDeZdHp78sM9+y1cr3UNwfqaejqGUfSuSaYaUwxtvxenSluo7aj MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b98ffe0e-d11d-41fa-35f6-08d460a597a8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002); SRVR:HE1PR0802MB2507; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2507; 3:Io7TBQ4HLtTY5TYtchez66vAvNYUpw7ndJWQk5IbZWvXkx+batQ22r0E7c2kN74rtYMIYJcDSjY7iAD5pzhdSANBL65nmF135j7a2DmNw1UltO6aGGE3qgGmg2Ju4KzrvDKWTbyNE4ySiaUswHL9kJETVaDG/nIwy65lyBSTRkej6rFsIOTZGhn68VJNSOsYVa9BZVerIw2LfsdJejsXHGGkjpX2QupPUpdN6ByZnRQKxCQdoDvaSetlXKbLoDaDX82d7qj0sGBmO91I9hkIh6B6TyLpeJEJPuNDqLexZX+bZn7/mq5nyBIDo87G8no6E4dZ1Uk2pQ44yXSObmkdPIsc31nSvAu5wkduKUZOoh7uIbfMFMzulOFaZQOl2/Jz+5jmxPyFcq+SIvj4nhRvtw==; 25:2Wozr77sZRpeKxWdW6L5xd3T7rR7C0uChHVJxwzVFbkbWfr4dcw5bcZsYQq8Ugp5iv+BxCc99+e2O7MptOGTYzmJu1VjHANKxlDwPCxrvRPrdZmaf9wYSNK10Sr+8P4Nv3cWjwhyVSuqiJOQ5Bxc/GDqK5VYpaft9Y//YpsiAhD7vaTz1GdLZfhLspLdvgiTwVisnlEvPQX+w2fPBvCLs0kO1tWSz9RY8In27hDC2Pvi4gx1zd0H96X7XkEjWSrqh0dIm7phNQtuvQQ1ccJnPyy6DAAcVr6TO0kPo9l7lrxhb+OyPV3qKks/v924bwT2+oWQobj+VHbtC6CaJdUxU2CGHyp68CxUNzZ4v23XPAkoAp7gJGjqst5YyrhquUdeWbjhj3+tPd80kpW8ohJl2RcS+FLy8neMYBFzQ/2r66og+UJq3cIwCNqwxj8ynawh77zDWsQobEDjEddzoGGZuw== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2507; 31:FtfK2BpB2yWmhvATPOviK/wSmlNOnNAvX/G1vxs/shkhXoBEudycJ0wYrdKfvxOf8UnkEjp1KYX/wbuBbsGsnWMM+HQ/N3EMrt7oHh8LGE5/VSujg9hl7GUMCx9wVqqyOqDF7/yd7J53Vhh0z7NGwg1gbuCC/RfK9cc88PqZ0jjmlR9MXQdLSOucF1dk6tYAJ6NuXPpIl1bhVutQp9BG2eWYUXUplso+xSTpOMMxqdikQUwA3e6EhJUTVZlyshYOr1VlPmB6Eh39ef3Meogo7XqIGwOSkvTH5odTRJzR0mI=; 20:z1ErpodPWsSt4opzAP13KUahprVDmz/0xe5j9xU2Ya8T6hv+NVECV0DK/cWCBe9KreV9+Onqh33TXy39tHJ+sIW9JrZXLQrTdVo45RyQChq3a/1xsS8yzV/MNY3g3Vi/RTtq0SFhfXxmf4WWTwNPLDzdk0/zCG32oiKpqDCkkBitjO783FSaXd3vMUj9AnVrIfHLzElVwpNak/gfPxuaWcbBOkvUy9Y+2uRzAhGHL9mhwCpRlKsjiBPagPf1sBvv/GX3N4/x2FQNUEa3BhguM0PrCy+Ga9QdvwTljluW4JJPIsWJz/CUrObJtcvA5/g6YwO9/kDjqOsRtyBidjPSdZBfSVGjrkwfP/HDJqKq133m1Nk3IHIoI279SH6nFeiZwxVzSmjeP76zPM6yQAJ9ZEOeHTHqVPA/eEQVNz0CHzSqt13ftQMWES9ORVFzpvDdGheFweD5wFcHZACkwrnarbf2nuoC8oryq1k4Qq5aTQxPNUHpIm+x9Fp5OjqWooknSZiJyos1sekDEWP6UaQFpA== X-Exchange-Antispam-Report-Test: UriScan:(215187933766430); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101521124)(601004)(2401047)(13020025)(13013025)(13023025)(8121501046)(3002001)(10201501046); SRVR:HE1PR0802MB2507; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0802MB2507; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2507; 4:k/AH+vACdel6vNJFLNL5TkYcK4zyWHxqlnknddatJ00QDSSFdp0L6czH8uqCbWFBSLN8DxOmyZ1cWNCRxWnR1cJc/k9PBxwgrftvLU8V1W5Jo9YRAKojuXjQmx6tI/Sx8ynBBw7ZEpiyVsUCJL/E/44SGpLZ7YJmoo153KIjJuNzQJMnaehAjlSnCGxe0x+yu0MNaRjzjjbHBYBzZNyMnyWFiUlHapDCUiO97UO/XGBnVlXH7ThVJ0mvYQzyOyT2s+edezQTJn7zMLz97MQrj0W/g9z5rtolvbx4y0/qrOMBOWm7Mr5u15ibj0lNXRw0TiJaTghenHTGDB78wAWO+6FO6oDFqM5K9xfallYWA1THFlOFcXHAYJMV59KJYOLEyWRLOFRjm3diRIth8bVmSaGZH/libEcFlcRXSBh0Y9fxGz6yLVgNB/iA5hfZttMOgvyiW6JuWJq71Sqg+hmRuBOpXESjqqAzvH3uJz+6xPZGXb94xYkea0suxx20Fsix; 23:ZipwAR1Lp6aJE8y8fRHCsexyrJ3iyZ/4Drg/pzbGcb/wxF8yvM8+WOGKghhw1WtUovfgDmOkTZyvU1lw/DMPsH9cfBCBxLB+88sE6bMjDm0120I0qRaVN1Nuyx+m1SO/vpVmsVBNsF1Pa/NlT7FWQw902GuS8m+8/etTG99Q2y+aX3g2dcDFocuHl4ejkeyn X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2507; 6:oM5l1jdyzN3i3wDUDBNex4Pw2zKdBH+Cvrc5gFgWG4bjlGsOQ48yPwz7Y2iz9q5iloYh2SeNhjM8eyb7chtWdEdJ+yXGodI8GMdXJ9EYupiK+W+OI67t+Pm83oxxI8uInrLVpE3ba7F35qaFV6IU8uRpxPS7AHNQI6JTsYQzcmBTNM2dQsT0ce1XRz3GAvBzpxKrqHLZBI/wbIXv5tVOFpBiXiQOy0+BjexjygsUgSozR/OFgUzQHa9yfmwNwsTh9hhgGC2BwClXoAXNCdyNcsMirOywxvQ4K38wSUj0ycoONd9imG4aoTdNh5eL5OZuEHifZSoJ6GLcWrms7o1pUAKR0N8gabVHA7/141ZXZ3zxnhgrz3FX0pBEjCdwWYfw8zCQ6fjCYmimc5TJVP9BMmOiWvOzU1e0jDEb+EwO8Zw=; 5:EVmcVXe0dY4GHzlEqFeKIyii4GYRNM8vDZm2oKQZUS7nwJ40cchdT43Z4CC0Vdv9cgKckExnqYzHDthAF4HYD1VRk/0n4MMF/DNcl4I2Jk4PeKnJXCKTIEbKb1418mxdGBVH3wp7+1qosbVtU1qIWQ==; 24:C5Mjz1khMB3mhRzAVbyILodFLaRbadpypM+gmXqQif2GVdUJoJ0cn3Nk3HQLRygp9M/CDd5n6a1rhCy9IT8hhN/di7rbgrBCQZ3tzSBun0M= SpamDiagnosticOutput: 1:2 SpamDiagnosticMetadata: 2b2090aae5154f77b71484475de18b04 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2507; 7:50Nu3EWLy5VFlhDDdol3cEwegMVB44gwJCDrXNaD9xgToVb6jLu7x3I42eQrIsWZGNzGw4HoEONyGEO0xfjrucGPVeg3uBoGdMvufoT8SLVIjdAOkolca03NX+lKzUs2M6O/v4wS0hUEVfMh/fdJq/onGeRlXBRwNIxHozvolvM1vh94w+lhDL0mOUBegiDxbzqeaHzHUYGHuhtIxakX4JM2hKyOkZC8+OlUAcIzTun47I4CP/Q1g5Hi67uNPEm5jDZKKmKFc5y7taz4QicI/I1ZaFARSxvI9Cd4CwBJlDOeJsr9cAUaYFQOPdwqF24M0PRhRtx1xYS9VmUP/USpHksYhklXC007Da2+bnzcRls=; 20:B7bUx/3xod/xzRMhWSMspswS2HnPZg2PFLVUHBj6vZhPfeXmvXu7P/t8/eQzF+5Nwx3Xxgm+DFvVIE+1t32WYeULo3JHvlyFjPsI6pL4ocJE5UNX4FYObZ/Rurwdu0ribNMPeDLseUJY5k5GQqvnysKRJUPqb6Kz9QkiXsmbEzs= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2017 13:19:29.2898 (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: HE1PR0802MB2507 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.25 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: HE1EUR01FT051.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: HE1PR0802MB2507.eurprd08.prod.outlook.com Cc: crml <criu@openvz.org>, Pavel Tikhomirov <ptikhomirov@virtuozzo.com>, Pavel Emelyanov <xemul@virtuozzo.com> Subject: [CRIU] [PATCH 2/5] mount: remove excess mi->external checks X-BeenThere: criu@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: CRIU development <criu.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/criu>, <mailto:criu-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/criu/> List-Post: <mailto:criu@openvz.org> List-Help: <mailto:criu-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/criu>, <mailto:criu-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: criu-bounces@openvz.org Errors-To: criu-bounces@openvz.org |
diff --git a/criu/mount.c b/criu/mount.c index 0053055..f5835d3 100644 --- a/criu/mount.c +++ b/criu/mount.c @@ -1744,7 +1744,7 @@ static int do_new_mount(struct mount_info *mi) goto out; } - if (!mi->is_ns_root && !mi->external && remount_ro) { + if (!mi->is_ns_root && remount_ro) { int fd; fd = open(mi->mountpoint, O_PATH); @@ -2041,7 +2041,7 @@ static bool can_mount_now(struct mount_info *mi) } } - if (!fsroot_mounted(mi) && (mi->bind == NULL && !mi->need_plugin && !mi->external)) + if (!fsroot_mounted(mi) && (mi->bind == NULL && !mi->need_plugin)) return false; shared:
mi->external is always false in these places https://jira.sw.ru/browse/PSBM-46753 Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com> --- criu/mount.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)