This commit was manufactured by cvs2svn to create tag

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

diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
index b7d4e57..b6674cf 100644 (file)
--- a/fs/ext3/ialloc.c
+++ b/fs/ext3/ialloc.c
@@ -23,9 +23,8 @@
 #include <linux/buffer_head.h>
 #include <linux/random.h>
 #include <linux/vs_dlimit.h>
-#include <linux/bitops.h>
-#include <linux/vs_dlimit.h>
 
+#include <asm/bitops.h>
 #include <asm/byteorder.h>
 
 #include "xattr.h"
@@ -448,7 +447,7 @@ struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, int mode)
                return ERR_PTR(-ENOMEM);
 
        if (sb->s_flags & MS_TAGXID)
-               inode->i_xid = vx_current_xid();
+               inode->i_xid = current->xid;
        else
                inode->i_xid = 0;