From patchwork Mon Aug 29 15:03:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 9304073 Return-Path: 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 787BA6077C for ; Mon, 29 Aug 2016 15:06:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AA0228577 for ; Mon, 29 Aug 2016 15:06:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5EF9B28669; Mon, 29 Aug 2016 15:06:48 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 585AA285B6 for ; Mon, 29 Aug 2016 15:06:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1beO6T-0004zx-4T; Mon, 29 Aug 2016 15:04:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1beO6S-0004zr-3x for xen-devel@lists.xenproject.org; Mon, 29 Aug 2016 15:04:00 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id E8/DC-28813-FDE44C75; Mon, 29 Aug 2016 15:03:59 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42K5GHpLX/ee35F wg5kTNS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ow5h36xFjwXrzjwj7uBcbFIFyMXh5DALEaJ B6susIM4LAJvWSQ2/zjABuJICLxjkdgy6RxTFyMnkBMjcXBCJ5RdIbH+cRc7iC0koCnRN2kzG 8SoXiaJ/9e/gCXYBPQl9u4/CDZWRGAlo0TrBYhJzAK5Ev09p1lBbGEBL4klHWuZQWwWAVWJI9 O+gtm8At4SE1bMYoPYJidx81wn8wRGvgWMDKsY1YtTi8pSi3TN9JKKMtMzSnITM3N0DQ2M9XJ Ti4sT01NzEpOK9ZLzczcxAkOlnoGBcQfjlTbnQ4ySHExKorwldw6HC/El5adUZiQWZ8QXleak Fh9ilOHgUJLgLfI9Ei4kWJSanlqRlpkDDFqYtAQHj5IILyNImre4IDG3ODMdInWK0Zhjy+9ra 5k4tk29t5ZJiCUvPy9VSpw3AqRUAKQ0ozQPbhAsmi4xykoJ8zIyMDAI8RSkFuVmlqDKv2IU52 BUEub9BTKFJzOvBG7fK6BTmIBOKQD5gre4JBEhJdXAeJJ5WbKpceSjVSePha184J0vsTdn6w3 j+0lCjxdvLXvwR2y2V2HQ3W71UvPdUgkvTV5zH78xIfOPYVBYmb9wZnDPI82rlqm9OuHnVuxJ lXn+56PpEbbHK7bv3+39jOsrK8+FCrfUzVOZ/ukdn8vyzUAwdcoxnxMny/t8ZVOtzyltK7vw8 ZZ9vRJLcUaioRZzUXEiAAIe+u6hAgAA X-Env-Sender: seth.forshee@canonical.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1472483037!31527645!1 X-Originating-IP: [209.85.218.47] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37076 invoked from network); 29 Aug 2016 15:03:58 -0000 Received: from mail-oi0-f47.google.com (HELO mail-oi0-f47.google.com) (209.85.218.47) by server-6.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 29 Aug 2016 15:03:58 -0000 Received: by mail-oi0-f47.google.com with SMTP id l203so199607012oib.1 for ; Mon, 29 Aug 2016 08:03:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Vm9RFX3Qfnj+dHu3l3XmHEU4SPG16SrCYrZRfgBMGKw=; b=DR9khoGjFS2UW/7d6J2evDdWgB3uBeySoQxOvPF+Wc6S17V7vfgulqhHwrCpbjuznZ AWjSPvzclowNaps2FZldQ+bJrMjM4hlKYR1hADwlgFcOc2J0ctP5aTtIRv3/k3CUbH3K wgYZAyq/V1nuVhGsr67XJ4HBIzhvotBU3ZT/Ue4bHAUeFObqhSr8V5ys6Bc+IVQUcRTO YQw7s+dfNfLVxzOMYPr4NcjQFIcigAVWyuew5mehGnYSqXgx769cBYyaxiNePG2arGQ7 k/kdDgyF5SfE9u5HCgD1Vjy46+UDHHsOIK93E37PmDb68OMEz6+X50t0SfuT2tWdUYT4 OryA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Vm9RFX3Qfnj+dHu3l3XmHEU4SPG16SrCYrZRfgBMGKw=; b=e3X4lWkL9BMc5e+C5JkQFRXD1OP56vp5L4w+DMnSkG0jppP6U+Ejrz9PrKLaEtKOTR vgV0Op8WRDhWuhrKFPEE3zzJ/mexOk+gmHqA+aRx/sHQPo2pK140yk9S5cjWKR8MGIoK LT/Vohm/c55ufQG+n0h+i5d03xdX3VGHvYohU9iARVJBaD14lRZZrxO2O64XuOxx53vV QdLAHIjBdt1zHCuGrsCNRrDdwpE9mLt3/YWMq6QBAn6CmQwiG9ibyK0KAbZq+pGYcKZu CWBWI4MbPNLKsCMamNGAUlSR32eVCJswZnmxExsSo/+3at9I912ylDmCw16iPX62PTqU rc8w== X-Gm-Message-State: AE9vXwNZ0yLHvF/Q4od3pUDW1wyA6NrGMmH0zuU01q7eIHH8r1Jok6yNZ0/3Tinq3ud7pFkS X-Received: by 10.157.41.73 with SMTP id d67mr2747994otb.26.1472483037206; Mon, 29 Aug 2016 08:03:57 -0700 (PDT) Received: from localhost ([2605:a601:aac:b820:a1b1:2d86:d84d:5595]) by smtp.gmail.com with ESMTPSA id b131sm14926122oih.8.2016.08.29.08.03.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Aug 2016 08:03:56 -0700 (PDT) From: Seth Forshee To: "Eric W. Biederman" , Boris Ostrovsky , David Vrabel , Juergen Gross Date: Mon, 29 Aug 2016 10:03:48 -0500 Message-Id: <1472483029-135090-1-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 2.7.4 Cc: Seth Forshee , linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Subject: [Xen-devel] [PATCH] xenbus: Use proc_create_mount_point() to create /proc/xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Mounting proc in user namespace containers fails if the xenbus filesystem is mounted on /proc/xen because this directory fails the "permanently empty" test. proc_create_mount_point() exists specifically to create such mountpoints in proc but is currently proc-internal. Export this interface to modules, then use it in xenbus when creating /proc/xen. Signed-off-by: Seth Forshee Acked-by: David Vrabel --- drivers/xen/xenbus/xenbus_probe.c | 2 +- fs/proc/generic.c | 1 + fs/proc/internal.h | 1 - include/linux/proc_fs.h | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index 33a31cfef55d..b5c1dec4a7c2 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -826,7 +826,7 @@ static int __init xenbus_init(void) * Create xenfs mountpoint in /proc for compatibility with * utilities that expect to find "xenbus" under "/proc/xen". */ - proc_mkdir("xen", NULL); + proc_create_mount_point("xen"); #endif out_error: diff --git a/fs/proc/generic.c b/fs/proc/generic.c index c633476616e0..be014c544d50 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c @@ -477,6 +477,7 @@ struct proc_dir_entry *proc_create_mount_point(const char *name) } return ent; } +EXPORT_SYMBOL(proc_create_mount_point); struct proc_dir_entry *proc_create_data(const char *name, umode_t mode, struct proc_dir_entry *parent, diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 7931c558c192..ff7259559d70 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -195,7 +195,6 @@ static inline bool is_empty_pde(const struct proc_dir_entry *pde) { return S_ISDIR(pde->mode) && !pde->proc_iops; } -struct proc_dir_entry *proc_create_mount_point(const char *name); /* * inode.c diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index b97bf2ef996e..8bd2f726436a 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -21,6 +21,7 @@ extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t, struct proc_dir_entry *, void *); extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t, struct proc_dir_entry *); +struct proc_dir_entry *proc_create_mount_point(const char *name); extern struct proc_dir_entry *proc_create_data(const char *, umode_t, struct proc_dir_entry *, @@ -56,6 +57,7 @@ static inline struct proc_dir_entry *proc_symlink(const char *name, struct proc_dir_entry *parent,const char *dest) { return NULL;} static inline struct proc_dir_entry *proc_mkdir(const char *name, struct proc_dir_entry *parent) {return NULL;} +static inline struct proc_dir_entry *proc_create_mount_point(const char *name) { return NULL; } static inline struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; } static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,