iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Russell King 2019-12-09 11:11:33 +00:00 committed by Al Viro
parent e3858e125b
commit 08ead1b8b9
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/adfs/super.c
View File

@ -347,6 +347,20 @@ static int adfs_validate_bblk(struct super_block *sb, struct buffer_head *bh,
return 0; 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) static int adfs_fill_super(struct super_block *sb, void *data, int silent)
{ {
struct adfs_discrecord *dr; struct adfs_discrecord *dr;
@ -376,7 +390,9 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
goto error; goto error;
/* Try to probe the filesystem boot block */ /* 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 (ret == -EILSEQ) {
if (!silent) if (!silent)
adfs_msg(sb, KERN_ERR, adfs_msg(sb, KERN_ERR,