projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux...
[linux-2.6-block.git]
/
fs
/
mount.h
diff --git
a/fs/mount.h
b/fs/mount.h
index f82c62840905f8be7df888a6dd87bfb2e2c30af5..0ad6f760ce521b93a2847c501e579d1c4a440334 100644
(file)
--- a/
fs/mount.h
+++ b/
fs/mount.h
@@
-1,10
+1,11
@@
#include <linux/mount.h>
#include <linux/seq_file.h>
#include <linux/poll.h>
#include <linux/mount.h>
#include <linux/seq_file.h>
#include <linux/poll.h>
+#include <linux/ns_common.h>
struct mnt_namespace {
atomic_t count;
struct mnt_namespace {
atomic_t count;
-
unsigned int proc_inum
;
+
struct ns_common ns
;
struct mount * root;
struct list_head list;
struct user_namespace *user_ns;
struct mount * root;
struct list_head list;
struct user_namespace *user_ns;