This commit was manufactured by cvs2svn to create tag

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

diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index b0b8e10..cf359ec 100644 (file)
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -36,7 +36,6 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/smp_lock.h>
-#include <linux/vserver/xid.h>
 #include "xattr.h"
 #include "acl.h"
 
@@ -873,7 +872,7 @@ restart:
                if (!buffer_uptodate(bh)) {
                        /* read error, skip block & hope for the best */
                        ext3_error(sb, __FUNCTION__, "reading directory #%lu "
-                                  "offset %lu", dir->i_ino, block);
+                                  "offset %lu\n", dir->i_ino, block);
                        brelse(bh);
                        goto next;
                }
@@ -990,7 +989,6 @@ static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, str
 
                if (!inode)
                        return ERR_PTR(-EACCES);
-               vx_propagate_xid(nd, inode);
        }
        if (inode)
                return d_splice_alias(inode, dentry);