X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fext2%2Fialloc.c;h=0886ddc674db7650df12dd52527de8b656610b67;hb=f7f1b0f1e2fbadeab12d24236000e778aa9b1ead;hp=993097030874ca1c519022e5bc9612b86d4b52d1;hpb=e3f6fb6212a7102bdb56ba38fa1e98fe72950475;p=linux-2.6.git

diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index 993097030..0886ddc67 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -19,7 +19,7 @@
 #include <linux/buffer_head.h>
 #include <linux/random.h>
 #include <linux/vs_dlimit.h>
-
+#include <linux/vserver/xid.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
@@ -468,11 +468,7 @@ struct inode *ext2_new_inode(struct inode *dir, int mode)
 	if (!inode)
 		return ERR_PTR(-ENOMEM);
 
-	if (sb->s_flags & MS_TAGXID)
-		inode->i_xid = vx_current_xid();
-	else
-		inode->i_xid = 0;
-
+	inode->i_xid = vx_current_fsxid(sb);
 	if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) {
 		err = -ENOSPC;
 		goto fail_dlim;