From: Mike Halcrow Sorry these got in there; they are really only useful for the userspace tools. Signed-off-by: Michael Halcrow Signed-off-by: Andrew Morton --- fs/ecryptfs/ecryptfs_kernel.h | 9 --------- 1 files changed, 9 deletions(-) diff -puN fs/ecryptfs/ecryptfs_kernel.h~ecryptfs-header-declarations-remove-unnecessary-ifndefs fs/ecryptfs/ecryptfs_kernel.h --- 25/fs/ecryptfs/ecryptfs_kernel.h~ecryptfs-header-declarations-remove-unnecessary-ifndefs Fri May 26 13:47:57 2006 +++ 25-akpm/fs/ecryptfs/ecryptfs_kernel.h Fri May 26 13:47:57 2006 @@ -35,16 +35,9 @@ #include /* Version verification for shared data structures w/ userspace */ -#ifndef ECRYPTFS_VERSION_MAJOR #define ECRYPTFS_VERSION_MAJOR 0x00 -#endif -#ifndef ECRYPTFS_VERSION_MINOR #define ECRYPTFS_VERSION_MINOR 0x01 -#endif - -#ifndef ECRYPTFS_SUPPORTED_FILE_VERSION #define ECRYPTFS_SUPPORTED_FILE_VERSION 0x01 -#endif #define ECRYPTFS_MAX_PASSWORD_LENGTH 64 #define ECRYPTFS_MAX_PASSPHRASE_BYTES ECRYPTFS_MAX_PASSWORD_LENGTH @@ -172,9 +165,7 @@ ecryptfs_get_key_payload_data(struct key #define ECRYPTFS_DEFAULT_CHAINING_MODE CRYPTO_TFM_MODE_CBC #define ECRYPTFS_TAG_3_PACKET_TYPE 0x8C #define ECRYPTFS_TAG_11_PACKET_TYPE 0xED -#ifndef MD5_DIGEST_SIZE #define MD5_DIGEST_SIZE 16 -#endif /** * This is the primary struct associated with each encrypted file. _