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

• Lines: 53
• Date: Wed Jul 5 22:15:26 2000
• Orig file: v2.4.0-test2/linux/fs/minix/bitmap.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test2/linux/fs/minix/bitmap.c linux/fs/minix/bitmap.c
@@ -80,7 +80,7 @@
 		return;
 	}
 	bh = sb->u.minix_sb.s_zmap[zone];
-	if (!minix_clear_bit(bit,bh->b_data))
+	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
@@ -112,7 +112,7 @@
 	}
 	if (!bh || j >= 8192)
 		return 0;
-	if (minix_set_bit(j,bh->b_data)) {
+	if (minix_test_and_set_bit(j,bh->b_data)) {
 		printk("new_block: bit already set");
 		DQUOT_FREE_BLOCK(sb, inode, 1);
 		goto repeat;
@@ -221,7 +221,7 @@
 	bh = inode->i_sb->u.minix_sb.s_imap[ino >> 13];
 	minix_clear_inode(inode);
 	clear_inode(inode);
-	if (!minix_clear_bit(ino & 8191, bh->b_data))
+	if (!minix_test_and_clear_bit(ino & 8191, bh->b_data))
 		printk("free_inode: bit %lu already cleared.\n",ino);
 	mark_buffer_dirty(bh, 1);
 }
@@ -252,7 +252,7 @@
 		unlock_super(sb);
 		return NULL;
 	}
-	if (minix_set_bit(j,bh->b_data)) {	/* shouldn't happen */
+	if (minix_test_and_set_bit(j,bh->b_data)) {	/* shouldn't happen */
 		printk("new_inode: bit already set");
 		iput(inode);
 		unlock_super(sb);
@@ -276,16 +276,13 @@
 	mark_inode_dirty(inode);
 
 	unlock_super(sb);
-printk("m_n_i: allocated inode ");
 	if(DQUOT_ALLOC_INODE(sb, inode)) {
-printk("fails quota test\n");
 		sb->dq_op->drop(inode);
 		inode->i_nlink = 0;
 		iput(inode);
 		*error = -EDQUOT;
 		return NULL;
 	}
-printk("is within quota\n");
 
 	*error = 0;
 	return inode;