From: Chanho Park Date: Sat, 2 May 2015 14:29:22 +0000 (-0400) Subject: ext4 crypto: remove duplicated encryption mode definitions X-Git-Tag: v5.15~15828^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9402bdcacdfedf7219a17e4d93300058a8e2aa4c;p=platform%2Fkernel%2Flinux-starfive.git 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 Cc: Michael Halcrow Cc: Andreas Dilger Signed-off-by: Chanho Park Signed-off-by: Theodore Ts'o --- diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index bca1bdc..1de8c7f 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 */