X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fext2%2Fialloc.c;h=5aa6769baee5ca8b5db287ece1ec5c57fb2678c2;hb=27879d9d66f2dea19cfcd0e1df8358a33447f45b;hp=1b1dce48fa57d2945d03823598ce78b2d670e270;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index 1b1dce48f..5aa6769ba 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -18,9 +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"
 #include "xattr.h"
 #include "acl.h"
@@ -127,7 +124,6 @@ void ext2_free_inode (struct inode * inode)
 	if (!is_bad_inode(inode)) {
 		/* Quota is already initialized in iput() */
 		ext2_xattr_delete_inode(inode);
-		DLIMIT_FREE_INODE(sb, inode->i_xid);
 	    	DQUOT_FREE_INODE(inode);
 		DQUOT_DROP(inode);
 	}
@@ -469,15 +465,6 @@ 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 = current->xid;
-	else
-		inode->i_xid = 0;
-
-	if (DLIMIT_ALLOC_INODE(sb, inode->i_xid)) {
-		err = -ENOSPC;
-		goto fail_dlim;
-	}
 	ei = EXT2_I(inode);
 	sbi = EXT2_SB(sb);
 	es = sbi->s_es;
@@ -634,15 +621,12 @@ got:
 	return inode;
 
 fail2:
-	DLIMIT_FREE_INODE(sb, inode->i_xid);	
 	inode->i_flags |= S_NOQUOTA;
 	inode->i_nlink = 0;
 	iput(inode);
 	return ERR_PTR(err);
 
 fail:
-	DLIMIT_FREE_INODE(sb, inode->i_xid);	
-fail_dlim:
 	make_bad_inode(inode);
 	iput(inode);
 	return ERR_PTR(err);