X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fext2%2Fballoc.c;h=79a7c63108132e31d82e43709d615a2e99999d9e;hb=refs%2Fremotes%2Fvserver;hp=117ebb9ca88b72f998962adc8858bb913e45618a;hpb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;p=linux-2.6.git

diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 117ebb9ca..79a7c6310 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -17,6 +17,7 @@
 #include <linux/buffer_head.h>
 #include <linux/capability.h>
 #include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines
@@ -103,13 +104,12 @@ static int reserve_blocks(struct super_block *sb, int count)
 {
 	struct ext2_sb_info *sbi = EXT2_SB(sb);
 	struct ext2_super_block *es = sbi->s_es;
-	unsigned long free_blocks;
-	unsigned long root_blocks;
+	unsigned long long free_blocks, root_blocks;
 
 	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
 	root_blocks = le32_to_cpu(es->s_r_blocks_count);
 
-	DLIMIT_ADJUST_BLOCK(sb, vx_current_xid(), &free_blocks, &root_blocks);
+	DLIMIT_ADJUST_BLOCK(sb, dx_current_tag(), &free_blocks, &root_blocks);
 
 	if (free_blocks < count)
 		count = free_blocks;