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

fs/adfs: use format_version from disc_record 



We only use the format version in one place during filesystem mount, so
it is pointless storing it in the superblock structure.  Also, we should
be using the version from the disc record in the map rather than the
boot block.

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

fs/adfs/adfs.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct adfs_sb_info { 
	__u32		s_map_size;	/* sector size of a map	*/

	signed int	s_map2blk;	/* shift left by this for map->sector*/

	unsigned int	s_log2sharesize;/* log2 share size */

	__le32		s_version;	/* disc format version */

	unsigned int	s_namelen;	/* maximum number of characters in name	 */

};

fs/adfs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -435,7 +435,6 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent) 
	asb->s_idlen		= dr->idlen;

	asb->s_map_size		= dr->nzones | (dr->nzones_high << 8);

	asb->s_map2blk		= dr->log2bpmb - dr->log2secsize;

	asb->s_version 		= dr->format_version;

	asb->s_log2sharesize	= dr->log2sharesize;



	asb->s_map = adfs_read_map(sb, dr);
@@ -467,7 +466,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent) 
	 * If this is a F+ disk with variable length directories,

	 * get the root_size from the disc record.

	 */

	if (asb->s_version) {

	if (dr->format_version) {

		root_obj.size = le32_to_cpu(dr->root_size);

		asb->s_dir     = &adfs_fplus_dir_ops;

		asb->s_namelen = ADFS_FPLUS_NAME_LEN;

CRA Git | Maintained and supported by SUSTech CRA and CCSE