diff options
| author | Andries E. Brouwer <andries.brouwer@cwi.nl> | 2003-07-10 05:47:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-10 05:47:19 -0700 |
| commit | 05081dcb7f2a9b8e623728b329bafb4e95909015 (patch) | |
| tree | a30b7e6cfb350b0ff1f46f9b68e0d4865d9d267c /include | |
| parent | a804e66caefbfca6464efe54af5cecef4d7484f6 (diff) | |
[PATCH] cryptoloop
util-linux is waiting for this: it needs to update "struct loop_info64"
to add the encryption policy name.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/loop.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/loop.h b/include/linux/loop.h index 7c056f50411f..ee3310e0b87c 100644 --- a/include/linux/loop.h +++ b/include/linux/loop.h @@ -36,7 +36,8 @@ struct loop_device { int (*transfer)(struct loop_device *, int cmd, char *raw_buf, char *loop_buf, int size, sector_t real_block); - char lo_name[LO_NAME_SIZE]; + char lo_file_name[LO_NAME_SIZE]; + char lo_crypt_name[LO_NAME_SIZE]; char lo_encrypt_key[LO_KEY_SIZE]; int lo_encrypt_key_size; struct loop_func_table *lo_encryption; @@ -49,7 +50,6 @@ struct loop_device { struct block_device *lo_device; unsigned lo_blocksize; void *key_data; - char key_reserved[48]; /* for use by the filter modules */ int old_gfp_mask; @@ -102,7 +102,8 @@ struct loop_info64 { __u32 lo_encrypt_type; __u32 lo_encrypt_key_size; /* ioctl w/o */ __u32 lo_flags; /* ioctl r/o */ - __u8 lo_name[LO_NAME_SIZE]; + __u8 lo_file_name[LO_NAME_SIZE]; + __u8 lo_crypt_name[LO_NAME_SIZE]; __u8 lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */ __u64 lo_init[2]; }; |