git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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/xattr.h>
#include <linux/namei.h>
#include <linux/security.h>
-#include <linux/vs
erver/xid
.h>
+#include <linux/vs
_tag
.h>
/*
* Get a XFS inode from a given vnode.
/*
* Get a XFS inode from a given vnode.
@@
-403,7
+403,7
@@
xfs_vn_lookup(
d_add(dentry, NULL);
return NULL;
}
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);
}
return d_splice_alias(vn_to_inode(cvp), dentry);
}
@@
-555,13
+555,13
@@
xfs_vn_follow_link(
ASSERT(dentry);
ASSERT(nd);
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;
}
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));
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;
}
vattr.va_mask |= XFS_AT_GID;
vattr.va_gid = attr->ia_gid;
}
- if ((ia_valid & ATTR_
XID) && IS_TAGXI
D(inode)) {
- vattr.va_mask |= XFS_AT_
XID
;
- vattr.va_
xid = attr->ia_xid
;
+ if ((ia_valid & ATTR_
TAG) && IS_TAGGE
D(inode)) {
+ vattr.va_mask |= XFS_AT_
TAG
;
+ vattr.va_
tag = attr->ia_tag
;
}
if (ia_valid & ATTR_SIZE) {
vattr.va_mask |= XFS_AT_SIZE;
}
if (ia_valid & ATTR_SIZE) {
vattr.va_mask |= XFS_AT_SIZE;