patch-2.4.0-test9 linux/fs/minix/bitmap.c

• Lines: 52
• Date: Wed Sep 27 19:23:40 2000
• Orig file: v2.4.0-test8/linux/fs/minix/bitmap.c
• Orig date: Tue Sep 5 14:07:30 2000

diff -u --recursive --new-file v2.4.0-test8/linux/fs/minix/bitmap.c linux/fs/minix/bitmap.c
@@ -83,8 +83,6 @@
 	if (!minix_test_and_clear_bit(bit,bh->b_data))
 		printk("free_block (%s:%d): bit already cleared\n",
 		       kdevname(sb->s_dev), block);
-	else
-		DQUOT_FREE_BLOCK(sb, inode, 1);
 	mark_buffer_dirty(bh);
 	return;
 }
@@ -100,9 +98,6 @@
 		return 0;
 	}
 repeat:
-	if(DQUOT_ALLOC_BLOCK(sb, inode, 1))
-		return -EDQUOT;
-
 	j = 8192;
 	bh = NULL;
 	for (i = 0; i < sb->u.minix_sb.s_zmap_blocks; i++) {
@@ -114,7 +109,6 @@
 		return 0;
 	if (minix_test_and_set_bit(j,bh->b_data)) {
 		printk("new_block: bit already set");
-		DQUOT_FREE_BLOCK(sb, inode, 1);
 		goto repeat;
 	}
 	mark_buffer_dirty(bh);
@@ -215,9 +209,6 @@
 		return;
 	}
 
-	DQUOT_FREE_INODE(inode->i_sb, inode);
-	DQUOT_DROP(inode);
-
 	bh = inode->i_sb->u.minix_sb.s_imap[ino >> 13];
 	minix_clear_inode(inode);
 	clear_inode(inode);
@@ -276,14 +267,6 @@
 	mark_inode_dirty(inode);
 
 	unlock_super(sb);
-	if(DQUOT_ALLOC_INODE(sb, inode)) {
-		sb->dq_op->drop(inode);
-		inode->i_nlink = 0;
-		iput(inode);
-		*error = -EDQUOT;
-		return NULL;
-	}
-
 	*error = 0;
 	return inode;
 }