X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Fuapi%2Flinux%2Flustre%2Flustre_user.h;h=e273457af5a34558c55da32a25bb2d748291d1ee;hp=6913d99f2800b564fab2ce094d565ae35e745470;hb=a21c13d4df4bea1bec0f5804136740ed53d5a57f;hpb=9c2ffe39bd32f85dab4fbb13855112e57b1dbc5a

diff --git a/lustre/include/uapi/linux/lustre/lustre_user.h b/lustre/include/uapi/linux/lustre/lustre_user.h
index 6913d99..e273457 100644
--- a/lustre/include/uapi/linux/lustre/lustre_user.h
+++ b/lustre/include/uapi/linux/lustre/lustre_user.h
@@ -361,6 +361,16 @@ struct ll_ioc_lease {
 	__u32		lil_ids[0];
 };
 
+struct ll_ioc_lease_id {
+	__u32		lil_mode;
+	__u32		lil_flags;
+	__u32		lil_count;
+	__u16		lil_mirror_id;
+	__u16		lil_padding1;
+	__u64		lil_padding2;
+	__u32		lil_ids[0];
+};
+
 /*
  * The ioctl naming rules:
  * LL_*     - works on the currently opened filehandle instead of parent dir
@@ -2084,7 +2094,6 @@ enum sk_crypt_alg {
 	SK_CRYPT_INVALID	= -1,
 	SK_CRYPT_EMPTY		= 0,
 	SK_CRYPT_AES256_CTR	= 1,
-	SK_CRYPT_MAX		= 2,
 };
 
 enum sk_hmac_alg {
@@ -2092,17 +2101,16 @@ enum sk_hmac_alg {
 	SK_HMAC_EMPTY	= 0,
 	SK_HMAC_SHA256	= 1,
 	SK_HMAC_SHA512	= 2,
-	SK_HMAC_MAX	= 3,
 };
 
 struct sk_crypt_type {
-	char    *sct_name;
-	size_t   sct_bytes;
+	const char     *sct_name;
+	int		sct_type;
 };
 
 struct sk_hmac_type {
-	char    *sht_name;
-	size_t   sht_bytes;
+	const char     *sht_name;
+	int		sht_type;
 };
 
 enum lock_mode_user {