vserver 1.9.5.x5

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

diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index 3d9fa57..9930970 100644 (file)
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -18,7 +18,6 @@
 #include <linux/backing-dev.h>
 #include <linux/buffer_head.h>
 #include <linux/random.h>
-#include <linux/vs_base.h>
 #include <linux/vs_dlimit.h>
 
 #include "ext2.h"
@@ -470,7 +469,7 @@ struct inode *ext2_new_inode(struct inode *dir, int mode)
                return ERR_PTR(-ENOMEM);
 
        if (sb->s_flags & MS_TAGXID)
-               inode->i_xid = current->xid;
+               inode->i_xid = vx_current_xid();
        else
                inode->i_xid = 0;
 
@@ -590,7 +589,7 @@ got:
        inode->i_ino = ino;
        inode->i_blksize = PAGE_SIZE;   /* This is the optimal IO size (for stat), not the fs block size */
        inode->i_blocks = 0;
-       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
        memset(ei->i_data, 0, sizeof(ei->i_data));
        ei->i_flags = EXT2_I(dir)->i_flags &
                ~(EXT2_BTREE_FL|EXT2_IUNLINK_FL|EXT2_BARRIER_FL);