Message ID | 20161025205846.GA25080@outlook.office365.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-fsdevel-owner@kernel.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EFDCD60233 for <patchwork-linux-fsdevel@patchwork.kernel.org>; Wed, 26 Oct 2016 00:30:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A71C228EE1 for <patchwork-linux-fsdevel@patchwork.kernel.org>; Wed, 26 Oct 2016 00:30:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B06D295AB; Wed, 26 Oct 2016 00:30:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_TVD_MIME_EPI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89C5828EE1 for <patchwork-linux-fsdevel@patchwork.kernel.org>; Wed, 26 Oct 2016 00:30:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754585AbcJZAai (ORCPT <rfc822;patchwork-linux-fsdevel@patchwork.kernel.org>); Tue, 25 Oct 2016 20:30:38 -0400 Received: from mail-db5eur01on0110.outbound.protection.outlook.com ([104.47.2.110]:20776 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753810AbcJZAah (ORCPT <rfc822;linux-fsdevel@vger.kernel.org>); Tue, 25 Oct 2016 20:30:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Gk5Dtt3mZrOtms02Hv+++UHFaD0jwg+hMbyYKPRg730=; b=A6FVaz0JV6D8P3Oy1V0LMivJqW6jtR9jCVo9LHC9qK47klRFOg++SbWt9sqgcuniILD6kNirwfNNtLNYM28vKiLjNISjhcJejXZtZdLCN7Y/B8AHuFhqTb3z8y5b6Z0ykM4di00dIeZSFn6O3qZNNmnOdAc9ZrRwa8AAEKOYSB0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=avagin@virtuozzo.com; Received: from outlook.office365.com (162.246.95.100) by AM5PR0801MB1970.eurprd08.prod.outlook.com (10.168.158.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.16; Tue, 25 Oct 2016 20:58:57 +0000 Date: Tue, 25 Oct 2016 13:58:47 -0700 From: Andrei Vagin <avagin@virtuozzo.com> To: "Eric W. Biederman" <ebiederm@xmission.com> CC: Andrey Vagin <avagin@openvz.org>, Alexander Viro <viro@zeniv.linux.org.uk>, Linux Containers <containers@lists.linux-foundation.org>, linux-fsdevel <linux-fsdevel@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org> Subject: Re: [RFC][PATCH v2] mount: In propagate_umount handle overlapping mount propagation trees Message-ID: <20161025205846.GA25080@outlook.office365.com> References: <20161013214650.GB19836@outlook.office365.com> <CANaxB-xPkgdyeg0z6TvExMfyy4uOC+Nu4Q99WpCscNKMWz8VPg@mail.gmail.com> <87wphb4pjn.fsf@x220.int.ebiederm.org> <8737jy3htt.fsf_-_@x220.int.ebiederm.org> <20161018024000.GA4901@outlook.office365.com> <87r37e9mnj.fsf@xmission.com> <877f95ngpr.fsf_-_@xmission.com> <20161020213052.GA25226@outlook.office365.com> <87pomtec6c.fsf@xmission.com> <877f90b27o.fsf_-_@xmission.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="envbJBWh7q8WU6mo" Content-Disposition: inline In-Reply-To: <877f90b27o.fsf_-_@xmission.com> User-Agent: Mutt/1.7.0 (2016-08-17) X-Originating-IP: [162.246.95.100] X-ClientProxiedBy: BN6PR03CA0023.namprd03.prod.outlook.com (10.168.230.161) To AM5PR0801MB1970.eurprd08.prod.outlook.com (10.168.158.9) X-MS-Office365-Filtering-Correlation-Id: 97d1b6aa-caa5-449d-1fea-08d3fd19bd81 X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 2:SvoNPGI8O3aEdVaZxwmEZSDU3grxjtSmS8+K2LUs3I7Nlx3LO/y9POIRVwmRBiO0uX1flmTkCqr2hmrn9G68nvSQgj20dfNEnb3J4pNpBDHsVphoSTHkMrRmke+t4xWtjzLvutCpqdCHyH9pnUmW9LfHg1aqxqNy/7HPHWyV6+auQq+aCbx7WBAn7R05bRZ4le2NKZSOIfJSNMcsM9d/jw==; 3:Y5kfdjbHaEbwZ89S/QqYb2WfecRtVSt4YOEp/6d6kF6dedGLlRJ0qj5ftbhuQdwku4/pa07fiDzdHMLvv6T9CTUSp0hX4KzPvdMQ5W59/BWmtFbDoPQq6qbeKSKRtGnzCf2o6g+b8nojwxM2HnJkfg==; 25:YVnfhh3pORulEPZhTobiVBib/4AdOJA5Etl+YEYYC+xluwggiGtyA4VfgXMGZomSxs8JUzSYoQE3OW0QdbDEkr7yO3DY1lPJMlMjNdaQLuEN09HHz0ZSBNXSaKZn3d2lTALMQkoGZkfuOUonKU0Q9ESw5IE7pY+z2fH7XqZnpni4UliyJY9/QuVp0GRRlVhU9kakE4YSQKsDX6RLWEdX84UKVCwo4R/quKvSKNBK39DZCjBStuhHB7F1sJ2cHnQ3RkiLUK7SQtKlhf2/DiSEhy8/nANbZn0WsWrWqwAcDICSAdpEu5DCUIpk2vPlK2DbG7ckgF/+CDwZyJd721BBqAWMvc/xlON7QnJs6GV4UaUUCfrn/K7IDR78Pj7hHXb86SJNYgu6+fRPsU9DWuOxSQvhVYVlSvBHaf1IGe5PHzBnINy5dtpaTl48AA7/fQA2YX0ApyvTSG+aI4sipLG5aa/t2ILT9jyYtLxJ/Joqldw= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM5PR0801MB1970; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 31:HOJVcCGD4csAoc9MeGNOZg0ZrLqvQD7XCofeMtFAZ30T9DEL+E6czBczTz/c3nyj5mZwuEGi5q0sXFIbT4x7MExtPAC2fRt156//FMITW3FS212g7Ke7vEmBm7L1rL5o4Rt52whtwaZgMASZneC2VId18vxdUXvh5fDVwYvjL7popZ2nuAaVD2pwZWbqxTd1Xu5m+jz8nqTauYXuACIGC5ZR/kCTqSb9MdqwO4m5s+EA/zZC1wHJqUUW9272TBiMwLkOvXtyelvJ14v3l1mk7EcshhXgDv8H/brxMbyLTyU=; 4:loQyKovdeGe5lStEk36HJu0U5/DK9G9+2uAY86I8QnW/gWc1uDLkR+7qAH9+bFQB25GNWGcCtYvYX7vmQnl1wHa2yZ5qrDGwsmkVnDQWWHtxIS2WXYtUHrFNMxU2i3OFxzwhRa8yJ9VMZmqLM5ftNbeRpKTQNMQw7eiUL7cKbcb7oF9zA6HfMq8s3aZHvUoFloHcV+bH91gD38ZtTbJ2qDEM+Dwk1v3HkPQ0/xY3+Ht7f1mShI2t/uNK4l+OxRNJ1sv00A/X5eyePLaJYof0O98XBtbn0XeLlVFH4Twr4UuvDR05ssDAMlDPnqgMPlqFxI6XeZc4nXgwsdiTYA8EVbiOK8yvX+pQ0v8kKQlZ+ZC67AdroBjOXpPy0pE0lSi+N+ESszP5YNu5Jxn1uiBSyVcJZyj/5QWzkNLiB7XeyKx0Vq0Y/sz6qz6oJgOrvpbi1f85RY3XWQbillLwO7m11El6meNPBEKfSmzztIGT5bbY+U0SK7A4MpIqrUkgUHnCL9X15DRJ4FG3bdG3alBSljT5MbD4YxtmgW3Yh+zexryYkgh1U3uJYVqvSnYYIRBs X-Microsoft-Antispam-PRVS: <AM5PR0801MB19700C0AF39AD47A62909CBBCFA80@AM5PR0801MB1970.eurprd08.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(20558992708506)(9452136761055)(151381331826461); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(102415321)(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6043046)(6042046); SRVR:AM5PR0801MB1970; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0801MB1970; X-Forefront-PRVS: 01068D0A20 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(24454002)(110136003)(68736007)(33656002)(81166006)(106356001)(105586002)(2476003)(81156014)(4326007)(574094002)(97736004)(19580395003)(19580405001)(53416004)(83506001)(4001350100001)(2906002)(42186005)(575784001)(5890100001)(77096005)(66066001)(86362001)(305945005)(5660300001)(189998001)(9686002)(84326002)(568964002)(4610100001)(69596002)(512884003)(7736002)(3846002)(93886004)(1076002)(8676002)(7846002)(50986999)(2950100002)(92566002)(76176999)(6116002)(6666003)(6916009)(54356999)(101416001)(586003)(7099028)(18370500001)(2700100001); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1970; H:outlook.office365.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1970; 23:LX2oABKv/ujOAORolKz17/Lkn05qBusSyirSKJy?= =?us-ascii?Q?eptyfqDOQLJK4UIEXPcFI8iaoXpVsEjaIdZZyCIKL0M2O/1m930VV+sj2R6H?= =?us-ascii?Q?Tlp2ARD7rkrG6Dgw57dGSl+H98lOdr1GOj2ODOVN44bVe4MBQbGcHpFIakQG?= =?us-ascii?Q?ia3KM6jFafDz/6Fd2q3373OAlk9iBP3pCtuTolBDpToxqHchZ3pczsB8a9l/?= =?us-ascii?Q?80mMJ+plA2IWax9lmvGYWRYUQZmBfpeIt4UeVCBoz1W9t9fknNJxT2VKr3uZ?= =?us-ascii?Q?Fp/ML4xpntbwH6A0jta1MrI42J0lqGbptkBGvW77Id6pr8pttVVmJ0m9LSAi?= =?us-ascii?Q?w7mJ7Q4QNnGIuVI60KW4GRACZJVe3tlndziD95K8TEee8fiQzakduXcYDmoi?= =?us-ascii?Q?8vroB0eUB32mVOr4xeT+vnlOt8+CvNDLer9bcpl/+WwvvRhSYRGaRBcW8z9n?= =?us-ascii?Q?TlqRJ1Q8faRh467GpGvdR1VdkluKDSot+XVAFU/SV1fkreJrfByRr1ezFoe0?= =?us-ascii?Q?3woMDdvrMkb2tqW4KVZYkWaB7Rey+gbX+OcjQC8PArTmWCCXht3DCTVmDaLD?= =?us-ascii?Q?ikUtCx44iBJhY+dtMEDNQAb3vmetbH+RpLc+Pet05b9gqCDnfbmMoVQ+S+7N?= =?us-ascii?Q?/b8grcK5ZhAG+9Ey9eR9aci+mFhxd2WEteKjdl5npX5hIl2yVPBOwJcoXu6l?= =?us-ascii?Q?FZK6JsDICGBwBBMHshUFs++8G/LXoVCPvTFaEspzr+nFW38lsDmfjFSxiRpb?= =?us-ascii?Q?u2fbbUycxXgHVFln9t+1Ju8AKmH2WWJ02ngLFZWxM2drbkWB/d3xnPQrTmtB?= =?us-ascii?Q?IlGThOMFd9KQmh1UaOdAhAw4rSpdvelw+DE55XEpE5kmTrBCQdBSxkz6c/Z7?= =?us-ascii?Q?roFHKYlkuWsqKQVgN6k6UzKrMXgQvDfA/4Ieih48mkAEhGr+yWKy7xKUdAoX?= =?us-ascii?Q?ly8ZTZFiUtrTQZ/9scTdW9ZdZK9caRltUJJeJis+Bf/pnjADeFZEBCk9bNx1?= =?us-ascii?Q?2fxGsDeCjPVu8pzQa8pBIqjUAx5deAcsiwVI8eeumRS/mIYhko0cjElntEnE?= =?us-ascii?Q?ZbQqo5T1bZ8MY9r0m5OYwPtU8xVc2DrJjhYs6ptSpKeZRMqfH0/XtYjqsK8O?= =?us-ascii?Q?UqGQUmNqbvdO+nQpSJIjCwFRwUZe5/6MupeDjNgw2HJpvzvcodNUIDiNL/nN?= =?us-ascii?Q?2l6RoIhxep7Dg2nTnYIWDw/xvluIfvArj8+c9knRXZ8NmOxP4p1KJbUzkCUW?= =?us-ascii?Q?m4u+kw9rFyDktcr5dnCVrWR4HuHkHiOaU2wBh0jP0lFSWty1iTsmEPtF80cC?= =?us-ascii?Q?EgSjCWCn2dVYXo4wrl3BfisTbG3w/WyqsVV2on1Xlk8PxSCwZL/dr2HNFhro?= =?us-ascii?Q?dIILnwx8sUUbJ+vZDHhj1RevI0sHV96lsQgPJ3crrjGOr7ke9UtuKmc3pkFP?= =?us-ascii?Q?nwwTYiF1erQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 6:C86u+f3MxUiBLCb3T1r6n1EKqjEKCbTGExDwal+joQJ6SqXJAkPD2hxqo54oZullGCnmqLeOenhhFUIoVZK1c5Scm/6nlChkcPlrppK5r0YjZy+K79hDlTxy2njxjoFNAg5ee4Y//ZLlasgwDg38jy6jyWWOUV+hwzxedUflESYG6qpjEo7mZM5YZPuvn7rnuXMhhPztaqyzzDbhoTPdUr3/si2fwFPon/vs+FJebXMHfzrb8W28ZZFljgfkcFKCeytSRj6/jtwie+FfdGNLWQDXEJLBl2MzpVlCp+nS0PdMl0Hharvq9mdWeLXB2SsM9VI6ct7QSqQLYbOMaGVyig==; 5:ZPmTFZGeHNT3v3/7Z4IGHyyYInKirH4AD3iKVBk8y5DO7BGrucyl2/hBwLfnl937TcBb49bAQZ4eVfs1W48zmNbJor2Dr4TZSKNwu7GXX+cpQL4bITLCQnIFO3jqt0Evq9wPptr+sgfIjNy/HOGbMQ==; 24:qrxJsndvOOKQ8XvRUgpMm7r/meXBZU+0WFCpvGRSI25V4KPpZCabIs2fMKUr7qOveyE/FbHp7VEdK8V5w6DY/6621cL9lp14zLtmmn/tVBs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1970; 7:4E5J54HL1JFVHY1BeRkaOZHh8N42xS6m1T9xEEU5xbYma8qVZ3DuK1GyLpYp+k5j0ovX9vW7mxj1crdO0yskYcsM3HBUpb8VGxcWsKbA9ua/MuljgIDoDrvxLgRoHvFiRPiW1RRrjnq3ICxr9MaGnwUpQyTYo44bkb9E7iDforyGdWe75VsJqwRuMQU6SVHCNLNLkPdnTxN27Y/g7fQ3MFiQMDbVFSWip1m+9gvqoy1uKdTTaX8M1/PdPQn8sXWeUWJMHTcc79092Sl0iANnwM0G1kGGeKbvEniKap7rotOmGnNylQQZfnUQ+JhaxFdS+gqP0GDqU87PFdUzGwikZBPTdja188wkK3XOq57oRCg=; 20:QJv5gb0Ozh9s0eMsjiCGLn3TbzukxAgpsfgC6nEeUK7nrPJnSYlbw0HNSbKdg/nZFafQFFNRiJFcAku3RkuzuvuQblnDBCsfUZhUctGd5S/immaX9Trmi1DJrZ5WaO0BsquQPnTYYEPyiSP75/HavC3Z2It8ookxvodQ97geEKo= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2016 20:58:57.0746 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1970 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: <linux-fsdevel.vger.kernel.org> X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/fs/pnode.c b/fs/pnode.c index 8fd1a3f..ebb7134 100644 --- a/fs/pnode.c +++ b/fs/pnode.c @@ -426,10 +426,16 @@ static struct mount *propagation_visit_child(struct mount *last_child, if (child && !IS_MNT_MARKED(child)) return child; - if (!child) + if (!child) { m = propagation_next(m, origin); - else + } else { + if (IS_MNT_MARKED(child)) { + if (m->mnt_group_id == origin->mnt_group_id) + return NULL; + m = m->mnt_master; + } m = propagation_next_sib(m, origin); + } } return NULL; } @@ -456,8 +462,14 @@ static struct mount *propagation_revisit_child(struct mount *last_child, if (!child) m = propagation_next(m, origin); - else + else { + if (!IS_MNT_MARKED(child)) { + if (m->mnt_group_id == origin->mnt_group_id) + return NULL; + m = m->mnt_master; + } m = propagation_next_sib(m, origin); + } } return NULL; }