@@ -222,16 +222,19 @@ struct fscrypt_inode_info {
222
222
struct fscrypt_prepared_key ci_enc_key ;
223
223
224
224
/* True if ci_enc_key should be freed when this struct is freed */
225
- bool ci_owns_key ;
225
+ u8 ci_owns_key : 1 ;
226
226
227
227
#ifdef CONFIG_FS_ENCRYPTION_INLINE_CRYPT
228
228
/*
229
229
* True if this inode will use inline encryption (blk-crypto) instead of
230
230
* the traditional filesystem-layer encryption.
231
231
*/
232
- bool ci_inlinecrypt ;
232
+ u8 ci_inlinecrypt : 1 ;
233
233
#endif
234
234
235
+ /* True if ci_dirhash_key is initialized */
236
+ u8 ci_dirhash_key_initialized : 1 ;
237
+
235
238
/*
236
239
* log2 of the data unit size (granularity of contents encryption) of
237
240
* this file. This is computable from ci_policy and ci_inode but is
@@ -242,6 +245,9 @@ struct fscrypt_inode_info {
242
245
/* Cached value: log2 of number of data units per FS block */
243
246
u8 ci_data_units_per_block_bits ;
244
247
248
+ /* Hashed inode number. Only set for IV_INO_LBLK_32 */
249
+ u32 ci_hashed_ino ;
250
+
245
251
/*
246
252
* Encryption mode used for this inode. It corresponds to either the
247
253
* contents or filenames encryption mode, depending on the inode type.
@@ -276,16 +282,12 @@ struct fscrypt_inode_info {
276
282
* the plaintext filenames -- currently just casefolded directories.
277
283
*/
278
284
siphash_key_t ci_dirhash_key ;
279
- bool ci_dirhash_key_initialized ;
280
285
281
286
/* The encryption policy used by this inode */
282
287
union fscrypt_policy ci_policy ;
283
288
284
289
/* This inode's nonce, copied from the fscrypt_context */
285
290
u8 ci_nonce [FSCRYPT_FILE_NONCE_SIZE ];
286
-
287
- /* Hashed inode number. Only set for IV_INO_LBLK_32 */
288
- u32 ci_hashed_ino ;
289
291
};
290
292
291
293
typedef enum {
0 commit comments