diff options
| author | Chanho Park <parkch98@gmail.com> | 2015-05-02 10:29:22 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2015-05-02 10:29:22 -0400 |
| commit | 9402bdcacdfedf7219a17e4d93300058a8e2aa4c (patch) | |
| tree | aa55c293737ab796bd3697dfe2054acd3d6a4f60 | |
| parent | fb63e5489f7ef5bb4d1a655984ca7ef98ffc5849 (diff) | |
ext4 crypto: remove duplicated encryption mode definitions
This patch removes duplicated encryption modes which were already in
ext4.h. They were duplicated from commit 3edc18d and commit f542fb.
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Michael Halcrow <mhalcrow@google.com>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | fs/ext4/ext4.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index bca1bdc67725..1de8c7f06897 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
| @@ -1067,12 +1067,6 @@ extern void ext4_set_bits(void *bm, int cur, int len); | |||
| 1067 | /* Metadata checksum algorithm codes */ | 1067 | /* Metadata checksum algorithm codes */ |
| 1068 | #define EXT4_CRC32C_CHKSUM 1 | 1068 | #define EXT4_CRC32C_CHKSUM 1 |
| 1069 | 1069 | ||
| 1070 | /* Encryption algorithms */ | ||
| 1071 | #define EXT4_ENCRYPTION_MODE_INVALID 0 | ||
| 1072 | #define EXT4_ENCRYPTION_MODE_AES_256_XTS 1 | ||
| 1073 | #define EXT4_ENCRYPTION_MODE_AES_256_GCM 2 | ||
| 1074 | #define EXT4_ENCRYPTION_MODE_AES_256_CBC 3 | ||
| 1075 | |||
| 1076 | /* | 1070 | /* |
| 1077 | * Structure of the super block | 1071 | * Structure of the super block |
| 1078 | */ | 1072 | */ |
