Pull altix into release branch

[linux-2.6] / include / linux / magic.h

diff --git a/include/linux/magic.h b/include/linux/magic.h
index 22036dd2ba362dee7b4b48e90416f65b9f2871aa..a9c6567fe70c02fa3493915c01da90738bbb3abb 100644 (file)
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -3,19 +3,23 @@
 
 #define ADFS_SUPER_MAGIC       0xadf5
 #define AFFS_SUPER_MAGIC       0xadff
+#define AFS_SUPER_MAGIC                0x5346414F
 #define AUTOFS_SUPER_MAGIC     0x0187
 #define CODA_SUPER_MAGIC       0x73757245
 #define EFS_SUPER_MAGIC                0x414A53
 #define EXT2_SUPER_MAGIC       0xEF53
 #define EXT3_SUPER_MAGIC       0xEF53
+#define EXT4_SUPER_MAGIC       0xEF53
 #define HPFS_SUPER_MAGIC       0xf995e849
 #define ISOFS_SUPER_MAGIC      0x9660
 #define JFFS2_SUPER_MAGIC      0x72b6
+#define KVMFS_SUPER_MAGIC      0x19700426
 
 #define MINIX_SUPER_MAGIC      0x137F          /* original minix fs */
 #define MINIX_SUPER_MAGIC2     0x138F          /* minix fs, 30 char names */
 #define MINIX2_SUPER_MAGIC     0x2468          /* minix V2 fs */
 #define MINIX2_SUPER_MAGIC2    0x2478          /* minix V2 fs, 30 char names */
+#define MINIX3_SUPER_MAGIC     0x4d5a          /* minix V3 fs */
 
 #define MSDOS_SUPER_MAGIC      0x4d44          /* MD */
 #define NCP_SUPER_MAGIC                0x564c          /* Guess, what 0x564c is :-) */