Commit 08ead1b8 authored by Russell King's avatar Russell King Committed by Al Viro
Browse files

fs/adfs: super: add support for E and E+ floppy image formats 



Add support for ADFS E and E+ floppy image formats, which, unlike their
hard disk variants, do not have a filesystem boot block - they have a
single map zone, with the map fragment stored at sector 0.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e3858e12

fs/adfs/super.c

+17 −1
Original line number Diff line number Diff line
@@ -347,6 +347,20 @@ static int adfs_validate_bblk(struct super_block *sb, struct buffer_head *bh, 
	return 0;

}



static int adfs_validate_dr0(struct super_block *sb, struct buffer_head *bh,

			      struct adfs_discrecord **drp)

{

	struct adfs_discrecord *dr;



	/* Do some sanity checks on the ADFS disc record */

	dr = (struct adfs_discrecord *)(bh->b_data + 4);

	if (adfs_checkdiscrecord(dr) || dr->nzones_high || dr->nzones != 1)

		return -EILSEQ;



	*drp = dr;

	return 0;

}



static int adfs_fill_super(struct super_block *sb, void *data, int silent)

{

	struct adfs_discrecord *dr;
@@ -376,7 +390,9 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent) 
		goto error;



	/* Try to probe the filesystem boot block */

	ret = adfs_probe(sb, ADFS_DISCRECORD, silent, adfs_validate_bblk);

	ret = adfs_probe(sb, ADFS_DISCRECORD, 1, adfs_validate_bblk);

	if (ret == -EILSEQ)

		ret = adfs_probe(sb, 0, silent, adfs_validate_dr0);

	if (ret == -EILSEQ) {

		if (!silent)

			adfs_msg(sb, KERN_ERR,

CRA Git | Maintained and supported by SUSTech CRA and CCSE