X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvserver%2Fxid.h;h=5d1c6c133ef8d24c2c5edffd4916e507b9df35b1;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=23908fd4c8a8a881a2cca1af26712723342d9cd5;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/include/linux/vserver/xid.h b/include/linux/vserver/xid.h
index 23908fd4c..5d1c6c133 100644
--- a/include/linux/vserver/xid.h
+++ b/include/linux/vserver/xid.h
@@ -1,6 +1,9 @@
 #ifndef _VX_XID_H
 #define _VX_XID_H
 
+#ifndef	CONFIG_VSERVER
+#warning config options missing
+#endif
 
 #define XID_TAG(in)	(!(in) || \
 	(((struct inode *)in)->i_sb && \
@@ -57,7 +60,7 @@
 #define MAX_GID		0xFFFFFFFF
 
 #define INOXID_XID(tag, uid, gid, xid)	\
-	((tag) ? ((uid) >> 16) & 0xFFFF) : 0)
+	((tag) ? (((uid) >> 16) & 0xFFFF) : 0)
 
 #define XIDINO_UID(tag, uid, xid)	\
 	((tag) ? (((uid) & 0xFFFF) | ((xid) << 16)) : (uid))
@@ -120,4 +123,7 @@ static inline gid_t vx_map_gid(gid_t gid)
 #define FIOC_SETXIDJ	_IOW('x', 3, long)
 #endif
 
+int vx_parse_xid(char *string, xid_t *xid, int remove);
+void vx_propagate_xid(struct nameidata *nd, struct inode *inode);
+
 #endif /* _VX_XID_H */