#warning config options missing
#endif
-#define XID_TAG(in) (!(in) || \
- (((struct inode *)in)->i_sb && \
- (((struct inode *)in)->i_sb->s_flags & MS_TAGXID)))
+#define XID_TAG(in) (IS_TAGXID(in))
+
+
+#ifdef CONFIG_XID_TAG_NFSD
+#define XID_TAG_NFSD 1
+#else
+#define XID_TAG_NFSD 0
+#endif
#ifdef CONFIG_INOXID_NONE
#endif
+#ifndef CONFIG_INOXID_NONE
+#define vx_current_fsxid(sb) \
+ ((sb)->s_flags & MS_TAGXID ? current->xid : 0)
+#else
+#define vx_current_fsxid(sb) (0)
+#endif
+
+#ifndef CONFIG_INOXID_INTERN
+#define XIDINO_XID(tag, xid) (0)
+#else
+#define XIDINO_XID(tag, xid) ((tag) ? (xid) : 0)
+#endif
+
#define INOXID_UID(tag, uid, gid) \
((tag) ? ((uid) & MAX_UID) : (uid))
#define INOXID_GID(tag, uid, gid) \
#define FIOC_SETXIDJ _IOW('x', 3, long)
#endif
+#ifdef CONFIG_XID_PROPAGATE
+
int vx_parse_xid(char *string, xid_t *xid, int remove);
-void vx_propagate_xid(struct nameidata *nd, struct inode *inode);
+
+void __vx_propagate_xid(struct nameidata *nd, struct inode *inode);
+
+#define vx_propagate_xid(n,i) __vx_propagate_xid(n,i)
+
+#else
+#define vx_propagate_xid(n,i) do { } while (0)
+#endif
#endif /* _VX_XID_H */