summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChanho Park <parkch98@gmail.com>2015-05-02 10:29:22 -0400
committerTheodore Ts'o <tytso@mit.edu>2015-05-02 10:29:22 -0400
commit9402bdcacdfedf7219a17e4d93300058a8e2aa4c (patch)
treeaa55c293737ab796bd3697dfe2054acd3d6a4f60 /fs
parentfb63e5489f7ef5bb4d1a655984ca7ef98ffc5849 (diff)
downloadblackbird-obmc-linux-9402bdcacdfedf7219a17e4d93300058a8e2aa4c.tar.gz
blackbird-obmc-linux-9402bdcacdfedf7219a17e4d93300058a8e2aa4c.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/ext4.h6
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);
/* Metadata checksum algorithm codes */
#define EXT4_CRC32C_CHKSUM 1
-/* Encryption algorithms */
-#define EXT4_ENCRYPTION_MODE_INVALID 0
-#define EXT4_ENCRYPTION_MODE_AES_256_XTS 1
-#define EXT4_ENCRYPTION_MODE_AES_256_GCM 2
-#define EXT4_ENCRYPTION_MODE_AES_256_CBC 3
-
/*
* Structure of the super block
*/
OpenPOWER on IntegriCloud