diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2021-05-06 11:48:58 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2021-05-10 08:46:08 -0700 |
| commit | 870915f282d4666d1c4c37fc6e468682eb33d0ab (patch) | |
| tree | 986874ddebbe0047d29b4449b8edc56eb64746ea | |
| parent | 91f9db23f6e8e34d29c92dc9075d4a2ca18057bd (diff) | |
| download | f2fs-tools-870915f282d4666d1c4c37fc6e468682eb33d0ab.tar.gz | |
f2fs_io: split definition check for crypto ioctl
This patch fixes undefined FSCRYPT_POLICY_V1 in old distribution.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | tools/f2fs_io/f2fs_io.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/f2fs_io/f2fs_io.h b/tools/f2fs_io/f2fs_io.h index 3a0278f..cdaf00f 100644 --- a/tools/f2fs_io/f2fs_io.h +++ b/tools/f2fs_io/f2fs_io.h @@ -91,7 +91,7 @@ typedef u32 __be32; #define F2FS_IOC_DECOMPRESS_FILE _IO(F2FS_IOCTL_MAGIC, 23) #define F2FS_IOC_COMPRESS_FILE _IO(F2FS_IOCTL_MAGIC, 24) -#ifndef FS_IOC_GET_ENCRYPTION_POLICY +#ifndef FSCRYPT_POLICY_V1 #define FSCRYPT_POLICY_V1 0 #define FSCRYPT_KEY_DESCRIPTOR_SIZE 8 struct fscrypt_policy_v1 { @@ -101,10 +101,12 @@ struct fscrypt_policy_v1 { __u8 flags; __u8 master_key_descriptor[FSCRYPT_KEY_DESCRIPTOR_SIZE]; }; +#endif +#ifndef FS_IOC_GET_ENCRYPTION_POLICY #define FS_IOC_GET_ENCRYPTION_POLICY _IOW('f', 21, struct fscrypt_policy_v1) #endif -#ifndef FS_IOC_GET_ENCRYPTION_POLICY_EX +#ifndef FSCRYPT_POLICY_V2 #define FSCRYPT_POLICY_V2 2 #define FSCRYPT_KEY_IDENTIFIER_SIZE 16 struct fscrypt_policy_v2 { @@ -124,6 +126,8 @@ struct fscrypt_get_policy_ex_arg { struct fscrypt_policy_v2 v2; } policy; /* output */ }; +#endif +#ifndef FS_IOC_GET_ENCRYPTION_POLICY_EX #define FS_IOC_GET_ENCRYPTION_POLICY_EX _IOWR('f', 22, __u8[9]) /* size + version */ #endif |