X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Fpnode.h;h=1ea4ae1efcd3f898097a011360bb978c29f7b565;hb=df40c01a9249873e4ad0625ae5d9fb831962b75c;hp=b59f0e9fe6b1d105c631ba566583f68a204c8cde;hpb=a58b0eb8e64b78d9315a5491955e78b1391d42e5;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/pnode.h b/fs/pnode.h
index b59f0e9..1ea4ae1 100644
--- a/fs/pnode.h
+++ b/fs/pnode.h
@@ -13,18 +13,19 @@
 
 #define IS_MNT_SHARED(mnt) (mnt->mnt_flags & MNT_SHARED)
 #define IS_MNT_SLAVE(mnt) (mnt->mnt_master)
-#define IS_MNT_NEW(mnt)  (!mnt->mnt_namespace)
+#define IS_MNT_NEW(mnt)  (!mnt->mnt_ns)
 #define CLEAR_MNT_SHARED(mnt) (mnt->mnt_flags &= ~MNT_SHARED)
+#define IS_MNT_UNBINDABLE(mnt) (mnt->mnt_flags & MNT_UNBINDABLE)
 
 #define CL_EXPIRE    		0x01
 #define CL_SLAVE     		0x02
 #define CL_COPY_ALL 		0x04
 #define CL_MAKE_SHARED 		0x08
-#define CL_PROPAGATION 		0x10
+#define CL_PRIVATE 		0x10
 
 static inline void set_mnt_shared(struct vfsmount *mnt)
 {
-	mnt->mnt_flags &= ~MNT_PNODE_MASK;
+	mnt->mnt_flags &= ~MNT_SHARED_MASK;
 	mnt->mnt_flags |= MNT_SHARED;
 }
 
@@ -33,4 +34,6 @@ int propagate_mnt(struct vfsmount *, struct dentry *, struct vfsmount *,
 		struct list_head *);
 int propagate_umount(struct list_head *);
 int propagate_mount_busy(struct vfsmount *, int);
+void mnt_release_group_id(struct vfsmount *);
+int get_dominating_id(struct vfsmount *mnt, const struct path *root);
 #endif /* _LINUX_PNODE_H */