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

diff --git a/fs/pnode.h b/fs/pnode.h
index 9b88ba0..1ea4ae1 100644
--- a/fs/pnode.h
+++ b/fs/pnode.h
@@ -12,17 +12,20 @@
 #include <linux/mount.h>
 
 #define IS_MNT_SHARED(mnt) (mnt->mnt_flags & MNT_SHARED)
-#define IS_MNT_NEW(mnt)  (!mnt->mnt_namespace)
+#define IS_MNT_SLAVE(mnt) (mnt->mnt_master)
+#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;
 }
 
@@ -31,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 */