Re: amiga affs support broken in 2.4.x kernels??

[Roman Zippel <zippel@linux-m68k.org>]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

Hi,

Mark Hounschell wrote:

>  Sorry I didn't get back to you yesterday afternoon. I was out of town.
>  Attached is the output from dmesg and the relavent info from
> /var/log/messages.

Could you try the attached patch? I forgot to initialize a variable
correctly.
(I also put a new version at
http://www.xs4all.nl/~zippel/affs.010417.tar.gz)

> I beleive the filesystem is ffs
> but not exactly sure. How do I tell?

It's printed if you mount with '-overbose', but it shouldn't be needed
anymore. :)

bye, Roman

[-- Attachment #2: affs.diff --]
[-- Type: text/plain, Size: 872 bytes --]

--- 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;