Commit 9402bdca authored May 02, 2015 by Chanho Park Committed by Theodore Ts'o May 02, 2015

ext4 crypto: remove duplicated encryption mode definitions

This patch removes duplicated encryption modes which were already in
ext4.h. They were duplicated from commit 3edc18d8 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>

parent fb63e548

fs/ext4/ext4.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -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
		*/

Admin message