[RFC PATCH 3/4] Deprecate loop crypto ioctl fields.

[Milan Broz]

Mark encryption loop fields in userspace API deprecated.

Signed-off-by: Milan Broz <mbroz@xxxxxxxxxx>
---
 include/uapi/linux/loop.h |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/uapi/linux/loop.h b/include/uapi/linux/loop.h
index e0cecd2..d0896c7 100644
--- a/include/uapi/linux/loop.h
+++ b/include/uapi/linux/loop.h
@@ -11,7 +11,7 @@
 
 
 #define LO_NAME_SIZE	64
-#define LO_KEY_SIZE	32
+#define LO_KEY_SIZE	32 /* deprecated */
 
 
 /*
@@ -33,11 +33,11 @@ struct loop_info {
 	unsigned long	   lo_inode; 		/* ioctl r/o */
 	__kernel_old_dev_t lo_rdevice; 		/* ioctl r/o */
 	int		   lo_offset;
-	int		   lo_encrypt_type;
-	int		   lo_encrypt_key_size; 	/* ioctl w/o */
+	int		   lo_encrypt_type;	/* deprecated */
+	int		   lo_encrypt_key_size; 	/* deprecated */
 	int		   lo_flags;			/* ioctl r/o */
 	char		   lo_name[LO_NAME_SIZE];
-	unsigned char	   lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
+	unsigned char	   lo_encrypt_key[LO_KEY_SIZE]; /* deprecated */
 	unsigned long	   lo_init[2];
 	char		   reserved[4];
 };
@@ -49,17 +49,17 @@ struct loop_info64 {
 	__u64		   lo_offset;
 	__u64		   lo_sizelimit;/* bytes, 0 == max available */
 	__u32		   lo_number;			/* ioctl r/o */
-	__u32		   lo_encrypt_type;
-	__u32		   lo_encrypt_key_size;		/* ioctl w/o */
+	__u32		   lo_encrypt_type;		/* deprecated */
+	__u32		   lo_encrypt_key_size;		/* deprecated */
 	__u32		   lo_flags;			/* ioctl r/o */
 	__u8		   lo_file_name[LO_NAME_SIZE];
-	__u8		   lo_crypt_name[LO_NAME_SIZE];
-	__u8		   lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
+	__u8		   lo_crypt_name[LO_NAME_SIZE]; /* deprecated */
+	__u8		   lo_encrypt_key[LO_KEY_SIZE]; /* deprecated */
 	__u64		   lo_init[2];
 };
 
 /*
- * Loop filter types
+ * Loop filter types (deprecated)
  */
 
 #define LO_CRYPT_NONE		0
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/