--- fs/affs/bitmap.c.org	Sat Apr  7 04:23:41 2001
+++ fs/affs/bitmap.c	Tue Apr 17 19:49:18 2001
@@ -124,7 +124,7 @@
 err_bh_read:
 	affs_error(sb,"affs_free_block","Cannot read bitmap block %u", bm->bm_key);
 	AFFS_SB->s_bmap_bh = NULL;
-	AFFS_SB->s_last_bmap = 0;
+	AFFS_SB->s_last_bmap = ~0;
 	up(&AFFS_SB->s_bmlock);
 	return;
 
@@ -262,7 +262,7 @@
 err_bh_read:
 	affs_error(sb,"affs_read_block","Cannot read bitmap block %u", bm->bm_key);
 	AFFS_SB->s_bmap_bh = NULL;
-	AFFS_SB->s_last_bmap = 0;
+	AFFS_SB->s_last_bmap = ~0;
 err_full:
 	pr_debug("failed\n");
 	up(&AFFS_SB->s_bmlock);
@@ -288,6 +288,8 @@
 		return 0;
 	}
 
+	AFFS_SB->s_last_bmap = ~0;
+	AFFS_SB->s_bmap_bh = NULL;
 	AFFS_SB->s_bmap_bits = sb->s_blocksize * 8 - 32;
 	AFFS_SB->s_bmap_count = (AFFS_SB->s_partition_size - AFFS_SB->s_reserved +
 				 AFFS_SB->s_bmap_bits - 1) / AFFS_SB->s_bmap_bits;