summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2017-02-06 17:45:37 -0700
committerJens Axboe <axboe@fb.com>2017-02-06 17:45:37 -0700
commit177f909e2a29b0308a2366d0213c2e76cadeb198 (patch)
tree57093bf5fa9f393fe7ac97a5f33accd93cfdba87
parent4291537ec1f7bd8039befc8b95cff5a190d842e9 (diff)
parent8c87fe722053658467bcc9e5ea82051ce3d3a693 (diff)
Merge branch 'for-4.11/block' into for-next
-rw-r--r--include/uapi/linux/sed-opal.h35
1 files changed, 18 insertions, 17 deletions
diff --git a/include/uapi/linux/sed-opal.h b/include/uapi/linux/sed-opal.h
index 31799526082a..fc06e3a20a51 100644
--- a/include/uapi/linux/sed-opal.h
+++ b/include/uapi/linux/sed-opal.h
@@ -48,37 +48,38 @@ enum opal_lock_state {
};
struct opal_key {
- uint8_t lr;
- uint8_t key_len;
- char key[OPAL_KEY_MAX];
+ __u8 lr;
+ __u8 key_len;
+ __u8 __align[6];
+ __u8 key[OPAL_KEY_MAX];
};
struct opal_lr_act {
- int sum;
- uint8_t num_lrs;
- uint8_t lr[OPAL_MAX_LRS];
struct opal_key key;
+ __u32 sum;
+ __u8 num_lrs;
+ __u8 lr[OPAL_MAX_LRS];
+ __u8 align[2]; /* Align to 8 byte boundary */
};
struct opal_session_info {
- int sum;
- enum opal_user who;
+ __u32 sum;
+ __u32 who;
struct opal_key opal_key;
- uint8_t __align[2];
};
struct opal_user_lr_setup {
- size_t range_start;
- size_t range_length;
- int RLE; /* Read Lock enabled */
- int WLE; /* Write Lock Enabled */
+ __u64 range_start;
+ __u64 range_length;
+ __u32 RLE; /* Read Lock enabled */
+ __u32 WLE; /* Write Lock Enabled */
struct opal_session_info session;
- uint8_t __align[4];
};
struct opal_lock_unlock {
- enum opal_lock_state l_state;
struct opal_session_info session;
+ __u32 l_state;
+ __u8 __align[4];
};
struct opal_new_pw {
@@ -97,9 +98,9 @@ struct opal_new_pw {
};
struct opal_mbr_data {
- u8 enable_disable;
struct opal_key key;
- uint8_t __align[5];
+ __u8 enable_disable;
+ __u8 __align[7];
};
#define IOC_OPAL_SAVE _IOW('p', 220, struct opal_lock_unlock)