Only ptype is actually used. Remove the other struct members.

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
 fs/affs/amigaffs.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/fs/affs/amigaffs.h b/fs/affs/amigaffs.h
index 1b973a669d23..9b40ae618852 100644
--- a/fs/affs/amigaffs.h
+++ b/fs/affs/amigaffs.h
@@ -49,12 +49,6 @@ struct affs_short_date {
 
 struct affs_root_head {
 	__be32 ptype;
-	__be32 spare1;
-	__be32 spare2;
-	__be32 hash_size;
-	__be32 spare3;
-	__be32 checksum;
-	__be32 hashtable[1];
 };
 
 struct affs_root_tail {
-- 
2.46.0

On Mon, Aug 26, 2024 at 04:27:36PM +0200, Thorsten Blum wrote:
> Only ptype is actually used. Remove the other struct members.
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
> ---
>  fs/affs/amigaffs.h | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/fs/affs/amigaffs.h b/fs/affs/amigaffs.h
> index 1b973a669d23..9b40ae618852 100644
> --- a/fs/affs/amigaffs.h
> +++ b/fs/affs/amigaffs.h
> @@ -49,12 +49,6 @@ struct affs_short_date {
>  
>  struct affs_root_head {
>  	__be32 ptype;
> -	__be32 spare1;
> -	__be32 spare2;
> -	__be32 hash_size;
> -	__be32 spare3;
> -	__be32 checksum;
> -	__be32 hashtable[1];
>  };

This is removing documentation, in a way. Since I suspect you were
looking at this due to hashtable, maybe just change that to [] and note
that it (and the other fields) aren't used, but they're kept around to
help document the format.

-- 
Kees Cook

On 26. Aug 2024, at 22:08, Kees Cook <kees@kernel.org> wrote:
> On Mon, Aug 26, 2024 at 04:27:36PM +0200, Thorsten Blum wrote:
>> Only ptype is actually used. Remove the other struct members.
>> 
>> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
>> ---
>> fs/affs/amigaffs.h | 6 ------
>> 1 file changed, 6 deletions(-)
>> 
>> diff --git a/fs/affs/amigaffs.h b/fs/affs/amigaffs.h
>> index 1b973a669d23..9b40ae618852 100644
>> --- a/fs/affs/amigaffs.h
>> +++ b/fs/affs/amigaffs.h
>> @@ -49,12 +49,6 @@ struct affs_short_date {
>> 
>> struct affs_root_head {
>> __be32 ptype;
>> - __be32 spare1;
>> - __be32 spare2;
>> - __be32 hash_size;
>> - __be32 spare3;
>> - __be32 checksum;
>> - __be32 hashtable[1];
>> };
> 
> This is removing documentation, in a way. Since I suspect you were
> looking at this due to hashtable, maybe just change that to [] and note
> that it (and the other fields) aren't used, but they're kept around to
> help document the format.

Yes, I was looking at hashtable. I'll submit a v2.

Thanks,
Thorsten

On 26. Aug 2024, at 22:48, Thorsten Blum <thorsten.blum@toblux.com> wrote:
> On 26. Aug 2024, at 22:08, Kees Cook <kees@kernel.org> wrote:
>> On Mon, Aug 26, 2024 at 04:27:36PM +0200, Thorsten Blum wrote:
>>> Only ptype is actually used. Remove the other struct members.
>>> 
>>> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
>>> ---
>>> fs/affs/amigaffs.h | 6 ------
>>> 1 file changed, 6 deletions(-)
>>> 
>>> diff --git a/fs/affs/amigaffs.h b/fs/affs/amigaffs.h
>>> index 1b973a669d23..9b40ae618852 100644
>>> --- a/fs/affs/amigaffs.h
>>> +++ b/fs/affs/amigaffs.h
>>> @@ -49,12 +49,6 @@ struct affs_short_date {
>>> 
>>> struct affs_root_head {
>>> __be32 ptype;
>>> - __be32 spare1;
>>> - __be32 spare2;
>>> - __be32 hash_size;
>>> - __be32 spare3;
>>> - __be32 checksum;
>>> - __be32 hashtable[1];
>>> };
>> 
>> This is removing documentation, in a way. Since I suspect you were
>> looking at this due to hashtable, maybe just change that to [] and note
>> that it (and the other fields) aren't used, but they're kept around to
>> help document the format.
> 
> Yes, I was looking at hashtable. I'll submit a v2.

I submitted a new patch instead of a v2.

Link: https://lore.kernel.org/linux-kernel/20240827124839.81288-2-thorsten.blum@toblux.com/