Skip to content

Commit effdcd5

Browse files
committed
Merge tag 'affs-for-6.12-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull affs updates from David Sterba: "Cleanups removing unused code and updating the definition of a flexible struct array" * tag 'affs-for-6.12-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: affs: Replace one-element array with flexible-array member affs: Remove unused macros GET_END_PTR, AFFS_GET_HASHENTRY
2 parents 35219bc + bf751ad commit effdcd5

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

fs/affs/affs.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414

1515
/* Ugly macros make the code more pretty. */
1616

17-
#define GET_END_PTR(st,p,sz) ((st *)((char *)(p)+((sz)-sizeof(st))))
18-
#define AFFS_GET_HASHENTRY(data,hashkey) be32_to_cpu(((struct dir_front *)data)->hashtable[hashkey])
1917
#define AFFS_BLOCK(sb, bh, blk) (AFFS_HEAD(bh)->table[AFFS_SB(sb)->s_hashsize-1-(blk)])
2018

2119
#define AFFS_HEAD(bh) ((struct affs_head *)(bh)->b_data)

fs/affs/amigaffs.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@ struct affs_short_date {
4949

5050
struct affs_root_head {
5151
__be32 ptype;
52+
/* The following fields are not used, but kept as documentation. */
5253
__be32 spare1;
5354
__be32 spare2;
5455
__be32 hash_size;
5556
__be32 spare3;
5657
__be32 checksum;
57-
__be32 hashtable[1];
58+
__be32 hashtable[];
5859
};
5960

6061
struct affs_root_tail {

0 commit comments

Comments
 (0)