From 66c86872b87591ae6e2a12af17f2b557215cd0a2 Mon Sep 17 00:00:00 2001 From: Roberto Sassu Date: Wed, 3 Nov 2010 11:11:15 +0100 Subject: [PATCH] --- yaml --- r: 231731 b: refs/heads/master c: 2a8652f4e0d11ee27b1d2870c600fd1300661a6e h: refs/heads/master i: 231729: ee6a599e57ece64b82caf20395bd08e2beb77643 231727: 269cd4f26fa93f0c7bfab821993cca82acf0d410 v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/ecryptfs_kernel.h | 1 - trunk/include/linux/magic.h | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 54c5dc210a4c..ede689cf32ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38a708d7759476318d0eec64af174513032ec67a +refs/heads/master: 2a8652f4e0d11ee27b1d2870c600fd1300661a6e diff --git a/trunk/fs/ecryptfs/ecryptfs_kernel.h b/trunk/fs/ecryptfs/ecryptfs_kernel.h index 413a3c48f0bb..bc530a81e4ce 100644 --- a/trunk/fs/ecryptfs/ecryptfs_kernel.h +++ b/trunk/fs/ecryptfs/ecryptfs_kernel.h @@ -192,7 +192,6 @@ ecryptfs_get_key_payload_data(struct key *key) (((struct user_key_payload*)key->payload.data)->data); } -#define ECRYPTFS_SUPER_MAGIC 0xf15f #define ECRYPTFS_MAX_KEYSET_SIZE 1024 #define ECRYPTFS_MAX_CIPHER_NAME_SIZE 32 #define ECRYPTFS_MAX_NUM_ENC_KEYS 64 diff --git a/trunk/include/linux/magic.h b/trunk/include/linux/magic.h index ff690d05f129..62730ea2b56e 100644 --- a/trunk/include/linux/magic.h +++ b/trunk/include/linux/magic.h @@ -16,6 +16,7 @@ #define TMPFS_MAGIC 0x01021994 #define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ #define SQUASHFS_MAGIC 0x73717368 +#define ECRYPTFS_SUPER_MAGIC 0xf15f #define EFS_SUPER_MAGIC 0x414A53 #define EXT2_SUPER_MAGIC 0xEF53 #define EXT3_SUPER_MAGIC 0xEF53