This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / ext2 / namei.c

diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index bb62484..661a751 100644 (file)
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -2,8 +2,7 @@
  * linux/fs/ext2/namei.c
  *
  * Rewrite to pagecache. Almost all code had been changed, so blame me
- * if the things go wrong. Please, send bug reports to
- * viro@parcelfarce.linux.theplanet.co.uk
+ * if the things go wrong. Please, send bug reports to viro@math.psu.edu
  *
  * Stuff here is basically a glue between the VFS and generic UNIXish
  * filesystem that keeps everything in pagecache. All knowledge of the
@@ -31,7 +30,6 @@
  */
 
 #include <linux/pagemap.h>
-#include <linux/vserver/xid.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
@@ -82,7 +80,6 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
                inode = iget(dir->i_sb, ino);
                if (!inode)
                        return ERR_PTR(-EACCES);
-               vx_propagate_xid(nd, inode);
        }
        if (inode)
                return d_splice_alias(inode, dentry);