diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-12-12 11:32:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-12-12 11:32:33 +1000 |
| commit | c1ee197d64f49c9e2a6c8e6a168083c411c1362c (patch) | |
| tree | ec8568a9d11ce55989c212efc4769cccc680964e /fs/bcachefs/bcachefs_format.h | |
| parent | a60501d7c2d3e70b3545b9b96576628e369d8e85 (diff) | |
| parent | a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 (diff) | |
| download | lwn-c1ee197d64f49c9e2a6c8e6a168083c411c1362c.tar.gz lwn-c1ee197d64f49c9e2a6c8e6a168083c411c1362c.zip | |
Backmerge tag 'v6.7-rc5' into drm-next
Linux 6.7-rc5
Alex requested this for some amdkfd work relying on the symbols exports.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'fs/bcachefs/bcachefs_format.h')
| -rw-r--r-- | fs/bcachefs/bcachefs_format.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h index 0a750953ff92..1ab1f08d763b 100644 --- a/fs/bcachefs/bcachefs_format.h +++ b/fs/bcachefs/bcachefs_format.h @@ -151,7 +151,11 @@ struct bpos { #else #error edit for your odd byteorder. #endif -} __packed __aligned(4); +} __packed +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +__aligned(4) +#endif +; #define KEY_INODE_MAX ((__u64)~0ULL) #define KEY_OFFSET_MAX ((__u64)~0ULL) @@ -1528,7 +1532,7 @@ struct bch_sb_field_disk_groups { x(move_extent_write, 36) \ x(move_extent_finish, 37) \ x(move_extent_fail, 38) \ - x(move_extent_alloc_mem_fail, 39) \ + x(move_extent_start_fail, 39) \ x(copygc, 40) \ x(copygc_wait, 41) \ x(gc_gens_end, 42) \ |