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
/
ext2
/
namei.c
diff --git
a/fs/ext2/namei.c
b/fs/ext2/namei.c
index
f39446b
..
2915f32
100644
(file)
--- a/
fs/ext2/namei.c
+++ b/
fs/ext2/namei.c
@@
-31,7
+31,7
@@
*/
#include <linux/pagemap.h>
*/
#include <linux/pagemap.h>
-#include <linux/vs
erver/xid
.h>
+#include <linux/vs
_tag
.h>
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
#include "ext2.h"
#include "xattr.h"
#include "acl.h"
@@
-67,7
+67,7
@@
static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
inode = iget(dir->i_sb, ino);
if (!inode)
return ERR_PTR(-EACCES);
inode = iget(dir->i_sb, ino);
if (!inode)
return ERR_PTR(-EACCES);
-
vx_propagate_xid
(nd, inode);
+
dx_propagate_tag
(nd, inode);
}
return d_splice_alias(inode, dentry);
}
}
return d_splice_alias(inode, dentry);
}
@@
-328,7
+328,7
@@
static int ext2_rename (struct inode * old_dir, struct dentry * old_dentry,
ext2_set_link(new_dir, new_de, new_page, old_inode);
new_inode->i_ctime = CURRENT_TIME_SEC;
if (dir_de)
ext2_set_link(new_dir, new_de, new_page, old_inode);
new_inode->i_ctime = CURRENT_TIME_SEC;
if (dir_de)
-
new_inode->i_nlink--
;
+
drop_nlink(new_inode)
;
inode_dec_link_count(new_inode);
} else {
if (dir_de) {
inode_dec_link_count(new_inode);
} else {
if (dir_de) {