diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-16 13:07:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-16 13:07:59 +0200 |
| commit | effdcd5275ed645f6e0f8e8ce690b97795722197 (patch) | |
| tree | a200cb702b4f645b9812636c704259b1b1871be1 /fs/affs | |
| parent | 35219bc5c71f4197c8bd10297597de797c1eece5 (diff) | |
| parent | bf751ad062b58d0750a5b9fb77d1400532a0ea44 (diff) | |
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
Diffstat (limited to 'fs/affs')
| -rw-r--r-- | fs/affs/affs.h | 2 | ||||
| -rw-r--r-- | fs/affs/amigaffs.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/affs/affs.h b/fs/affs/affs.h index 2e612834329a..e8c2c4535cb3 100644 --- a/fs/affs/affs.h +++ b/fs/affs/affs.h @@ -14,8 +14,6 @@ /* Ugly macros make the code more pretty. */ -#define GET_END_PTR(st,p,sz) ((st *)((char *)(p)+((sz)-sizeof(st)))) -#define AFFS_GET_HASHENTRY(data,hashkey) be32_to_cpu(((struct dir_front *)data)->hashtable[hashkey]) #define AFFS_BLOCK(sb, bh, blk) (AFFS_HEAD(bh)->table[AFFS_SB(sb)->s_hashsize-1-(blk)]) #define AFFS_HEAD(bh) ((struct affs_head *)(bh)->b_data) diff --git a/fs/affs/amigaffs.h b/fs/affs/amigaffs.h index 1b973a669d23..da3217ab6adb 100644 --- a/fs/affs/amigaffs.h +++ b/fs/affs/amigaffs.h @@ -49,12 +49,13 @@ struct affs_short_date { struct affs_root_head { __be32 ptype; + /* The following fields are not used, but kept as documentation. */ __be32 spare1; __be32 spare2; __be32 hash_size; __be32 spare3; __be32 checksum; - __be32 hashtable[1]; + __be32 hashtable[]; }; struct affs_root_tail { |