author: Russell King <rmk+kernel@armlinux.org.uk> 2019-06-04 14:49:41 +0100
committer: Al Viro <viro@zeniv.linux.org.uk> 2019-06-26 20:14:13 -0400
commit: cb88b5a387dd9ba9c36fd76c4cdc187cdce5974c
parent: 275f5b99d6d4e6fccb7cea6783460939856c1306
Commit Summary:
Diffstat:
2 files changed, 1 insertion, 3 deletions
diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h
index ab13b5dd34a3..1c31861aa115 100644
--- a/fs/adfs/adfs.h
+++ b/fs/adfs/adfs.h
@@ -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 */
};
diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index 7f6d00467baa..c5607685788e 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -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;