diff options
| author | Paul Lawrence <paullawrence@google.com> | 2020-04-13 08:35:34 -0700 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2020-04-13 20:54:42 +0000 |
| commit | df76f38e95cce2ef95dbea16d14cb316cfb0639f (patch) | |
| tree | 65507230e5bb2e2e5c5c73e30be3568cd06e7cf9 /include/uapi | |
| parent | c2c01a546143b82a32035be65fdd394f15e2e8f9 (diff) | |
Revert "ANDROID: Incremental fs: Fix initialization, use of bitfields"
This change was never cherry-picked to other branches,
is just syntactic sugar, and clashes with another change. Revert,
and then apply cleanly over all branches as needed.
This reverts commit 2664a43d88d91eb09f212cb26e111656a4acee49.
Change-Id: I51dca9cb046cc15302c22e8f73e58dcf4849f84d
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/incrementalfs.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/uapi/linux/incrementalfs.h b/include/uapi/linux/incrementalfs.h index ac775b64bdcf..13c3d5173e14 100644 --- a/include/uapi/linux/incrementalfs.h +++ b/include/uapi/linux/incrementalfs.h @@ -150,13 +150,10 @@ struct incfs_fill_block { /* Values from enum incfs_block_flags */ __u8 flags; - /* Reserved - must be 0 */ __u16 reserved1; - /* Reserved - must be 0 */ __u32 reserved2; - /* Reserved - must be 0 */ __aligned_u64 reserved3; }; @@ -206,10 +203,8 @@ struct incfs_new_file_args { */ __u16 mode; - /* Reserved - must be 0 */ __u16 reserved1; - /* Reserved - must be 0 */ __u32 reserved2; /* @@ -242,7 +237,6 @@ struct incfs_new_file_args { */ __u32 file_attr_len; - /* Reserved - must be 0 */ __u32 reserved4; /* @@ -270,7 +264,6 @@ struct incfs_new_file_args { /* Size of signature_info */ __aligned_u64 signature_size; - /* Reserved - must be 0 */ __aligned_u64 reserved6; }; |