vserver 1.9.5.x5

[linux-2.6.git] / include / linux / vserver / xid.h

diff --git a/include/linux/vserver/xid.h b/include/linux/vserver/xid.h
index 23908fd..5d1c6c1 100644 (file)
--- 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 */