Commit effdcd52 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 35219bc5 bf751ad0
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
/* Ugly macros make the code more pretty. */ /* 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_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) #define AFFS_HEAD(bh) ((struct affs_head *)(bh)->b_data)
......
...@@ -49,12 +49,13 @@ struct affs_short_date { ...@@ -49,12 +49,13 @@ struct affs_short_date {
struct affs_root_head { struct affs_root_head {
__be32 ptype; __be32 ptype;
/* The following fields are not used, but kept as documentation. */
__be32 spare1; __be32 spare1;
__be32 spare2; __be32 spare2;
__be32 hash_size; __be32 hash_size;
__be32 spare3; __be32 spare3;
__be32 checksum; __be32 checksum;
__be32 hashtable[1]; __be32 hashtable[];
}; };
struct affs_root_tail { struct affs_root_tail {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment