From patchwork Tue May 10 20:44:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Serge E. Hallyn" X-Patchwork-Id: 620819 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3r4B7P1pfPz9sf6; Wed, 11 May 2016 06:44:17 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1b0EVp-0001Pj-Rz; Tue, 10 May 2016 20:44:13 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1b0EVj-0001PO-Lx for kernel-team@lists.ubuntu.com; Tue, 10 May 2016 20:44:07 +0000 Received: from h2.hallyn.com ([78.46.35.8] helo=ubuntumail) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1b0EVj-0004AQ-9z for kernel-team@lists.ubuntu.com; Tue, 10 May 2016 20:44:07 +0000 Date: Tue, 10 May 2016 20:44:05 +0000 From: Serge Hallyn To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3] Revert "UBUNTU: SAUCE: cgroup mount: ignore nsroot=" Message-ID: <20160510204405.GA19753@ubuntumail> References: <20160510204326.GA19680@ubuntumail> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160510204326.GA19680@ubuntumail> User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This reverts commit f7d70a0c83bfd752ee9483661e8dd2e6091421bf. --- kernel/cgroup.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/cgroup.c b/kernel/cgroup.c index d344dc5..8a4408f 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1680,10 +1680,6 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) opts->none = true; continue; } - if (!strncmp(token, "nsroot=", 7)) { - /* ignore nsroot= copied from mountinfo */ - continue; - } if (!strcmp(token, "all")) { /* Mutually exclusive option 'all' + subsystem name */ if (one_ss)