diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-03 00:25:17 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-03 00:25:17 +0300 |
| commit | e4aa67b023167c570be95a39149a918cca9e36a0 (patch) | |
| tree | 230c2c101310a31068d7584370d08c4dd13fc414 /fs/jfs/jfs_dinode.h | |
| parent | ced4cca754a6322463720768ce50c45c2865ba5b (diff) | |
| parent | 5d299f44d7658f4423e33a0b9915bc8d81687511 (diff) | |
| download | linux-e4aa67b023167c570be95a39149a918cca9e36a0.tar.xz | |
Merge tag 'jfs-5.14' of git://github.com/kleikamp/linux-shaggy
Pull jfs updates from David Kleikamp:
"JFS fixes for 5.14"
* tag 'jfs-5.14' of git://github.com/kleikamp/linux-shaggy:
jfs: Avoid field-overflowing memcpy()
jfs: remove unnecessary oom message
jfs: fix GPF in diFree
fs/jfs: Fix missing error code in lmLogInit()
jfs: Remove trailing semicolon in macros
fs: Fix typo issue
Diffstat (limited to 'fs/jfs/jfs_dinode.h')
| -rw-r--r-- | fs/jfs/jfs_dinode.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/fs/jfs/jfs_dinode.h b/fs/jfs/jfs_dinode.h index d6af79e94263..6b231d0d0071 100644 --- a/fs/jfs/jfs_dinode.h +++ b/fs/jfs/jfs_dinode.h @@ -101,7 +101,6 @@ struct dinode { u8 unused[16]; /* 16: */ dxd_t _dxd; /* 16: */ union { - __le32 _rdev; /* 4: */ /* * The fast symlink area * is expected to overflow @@ -109,9 +108,15 @@ struct dinode { * needed (which will clear * INLINEEA). */ - u8 _fastsymlink[128]; - } _u; - u8 _inlineea[128]; + struct { + union { + __le32 _rdev; /* 4: */ + u8 _fastsymlink[128]; + } _u; + u8 _inlineea[128]; + }; + u8 _inline_all[256]; + }; } _special; } _u2; } _file; @@ -122,6 +127,7 @@ struct dinode { #define di_rdev u._file._u2._special._u._rdev #define di_fastsymlink u._file._u2._special._u._fastsymlink #define di_inlineea u._file._u2._special._inlineea +#define di_inline_all u._file._u2._special._inline_all } u; }; |