summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRoberto Sassu <roberto.sassu@polito.it>2010-11-03 11:11:15 +0100
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-01-17 17:44:31 +0100
commit2a8652f4e0d11ee27b1d2870c600fd1300661a6e (patch)
treef7ee0d8614b60a8733bcf0cfba8ac94776925ed5 /include
parentecryptfs: fix truncation error in ecryptfs_read_update_atime (diff)
downloadlinux-2a8652f4e0d11ee27b1d2870c600fd1300661a6e.tar.xz
linux-2a8652f4e0d11ee27b1d2870c600fd1300661a6e.zip
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: Roberto Sassu <roberto.sassu@polito.it> Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/magic.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h
index ff690d05f129..62730ea2b56e 100644
--- a/include/linux/magic.h
+++ b/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