Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a8652f4 authored by Roberto Sassu's avatar Roberto Sassu Committed by Tyler Hicks
Browse files

ecryptfs: moved ECRYPTFS_SUPER_MAGIC definition to linux/magic.h 



The definition of ECRYPTFS_SUPER_MAGIC has been moved to the include
file 'linux/magic.h' to become available to other kernel subsystems.

Signed-off-by: default avatarRoberto Sassu <roberto.sassu@polito.it>
Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
parent 38a708d7

fs/ecryptfs/ecryptfs_kernel.h

+0 −1
Original line number Diff line number Diff line
@@ -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

include/linux/magic.h

+1 −0
Original line number Diff line number Diff line
@@ -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