fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / xfs / linux-2.6 / xfs_iops.c

diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
index 1e7ec5d..19525d4 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@ -53,7 +53,7 @@
 #include <linux/xattr.h>
 #include <linux/namei.h>
 #include <linux/security.h>
-#include <linux/vserver/xid.h>
+#include <linux/vs_tag.h>
 
 /*
  * Get a XFS inode from a given vnode.
@@ -403,7 +403,7 @@ xfs_vn_lookup(
                d_add(dentry, NULL);
                return NULL;
        }
-       vx_propagate_xid(nd, vn_to_inode(cvp));
+       dx_propagate_tag(nd, vn_to_inode(cvp));
 
        return d_splice_alias(vn_to_inode(cvp), dentry);
 }
@@ -555,13 +555,13 @@ xfs_vn_follow_link(
        ASSERT(dentry);
        ASSERT(nd);
 
-       link = (char *)kmalloc(MAXPATHLEN+1, GFP_KERNEL);
+       link = kmalloc(MAXPATHLEN+1, GFP_KERNEL);
        if (!link) {
                nd_set_link(nd, ERR_PTR(-ENOMEM));
                return NULL;
        }
 
-       uio = (uio_t *)kmalloc(sizeof(uio_t), GFP_KERNEL);
+       uio = kmalloc(sizeof(uio_t), GFP_KERNEL);
        if (!uio) {
                kfree(link);
                nd_set_link(nd, ERR_PTR(-ENOMEM));
@@ -673,9 +673,9 @@ xfs_vn_setattr(
                vattr.va_mask |= XFS_AT_GID;
                vattr.va_gid = attr->ia_gid;
        }
-       if ((ia_valid & ATTR_XID) && IS_TAGXID(inode)) {
-               vattr.va_mask |= XFS_AT_XID;
-               vattr.va_xid = attr->ia_xid;
+       if ((ia_valid & ATTR_TAG) && IS_TAGGED(inode)) {
+               vattr.va_mask |= XFS_AT_TAG;
+               vattr.va_tag = attr->ia_tag;
        }
        if (ia_valid & ATTR_SIZE) {
                vattr.va_mask |= XFS_AT_SIZE;