xenfs: Use proc_create_mount_point() to create /proc/xen
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 <seth.forshee@canonical.com> Signed-off-by: David Vrabel <david.vrabel@citrix.com> Signed-off-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
parent
1ea55e8078
commit
f97df70b1c
@ -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:
|
||||
|
@ -479,6 +479,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,
|
||||
|
@ -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
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user