kevin/linux
1
Fork 0
Code

affs-for-6.12-tag

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE8rQSAMVO+zA4DBdWxWXV+ddtWDsFAmbjBYIACgkQxWXV+ddt
 WDvJpg/8DqbAffDATPFnbA9OmbsZyKJ63i0qU+Sl4qbkXZ7aIQ61TJpbTHxoQVTQ
 Ur8+dZP4sUpMiWbqja0TJJsyuur6cyZPT8yjP7REsSJwJmaelUuQ4h1UStqD4dXJ
 +4CBhrjXtyW/f1PyMJ7AFSGtOrzd/3rAXf2E3SBeXWuxqvEJEQra7Shy6dZUcr28
 IKII4Z6kfkkfaJk3XxLHwWCbRnlGCpiyncnxKxGaXgQ9ERgmKLYQpttjD6aqre+T
 O0y5tLg+WLZikrr7Yr5ISVh0aAokRH6xnMKyy+Mju6/Qvx6+SITf6ezj7/hCsj5I
 SwEHkW2ncRoYX3aTFADTx2xFEFT5YH50ox+RlxelMs1o5IH4e8Rk5wCFQPsUpUZi
 B7LWLAJ24ekjC/COtMivLcRZCqGqBNCTvnKDZzU6JqVAb8LD0hhWz2xFvlR+WIM0
 1VMXAr+IaxMJDs/v1ZouE+Sg0NZ3u+IFDwYd+xeCHTG5UoM/cKxUHTcMlb3oEJRu
 L2QKnkSgSEKt8uVwgxKTFPPtg6FKCX7m9W2N2ZwKMZuM8Q9o/XftSrBw7LXfcBiZ
 ZIQUvNY/sXtQ6s5+0x9Cs/mNnOY7hSKOqyJb0wPQ767K3D9sl+wcqqvZJ+e+qzqM
 J1ATXG9O5/XevigqhBfX1DhLVyeg87KBT0SbQYazNF3/b8hMZc8=
 =quLk
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-09-16 13:07:59 +02:00
commit effdcd5275
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/affs/affs.h
View File

@ -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)

3
fs/affs/amigaffs.h
View File

@ -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 {