[RFC][Patch 3/5] integrity: special fs magic

From: Mimi Zohar
Date: Fri May 23 2008 - 11:05:44 EST


- Move special fs magic number definitions to magic.h
- Add magic.h include

Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
---
Index: linux-2.6.26-rc3-git2/mm/shmem.c
===================================================================
--- linux-2.6.26-rc3-git2.orig/mm/shmem.c
+++ linux-2.6.26-rc3-git2/mm/shmem.c
@@ -50,14 +50,12 @@
#include <linux/migrate.h>
#include <linux/highmem.h>
#include <linux/seq_file.h>
+#include <linux/magic.h>

#include <asm/uaccess.h>
#include <asm/div64.h>
#include <asm/pgtable.h>

-/* This magic number is used in glibc for posix shared memory */
-#define TMPFS_MAGIC 0x01021994
-
#define ENTRIES_PER_PAGE (PAGE_CACHE_SIZE/sizeof(unsigned long))
#define ENTRIES_PER_PAGEPAGE (ENTRIES_PER_PAGE*ENTRIES_PER_PAGE)
#define BLOCKS_PER_PAGE (PAGE_CACHE_SIZE/512)
Index: linux-2.6.26-rc3-git2/security/inode.c
===================================================================
--- linux-2.6.26-rc3-git2.orig/security/inode.c
+++ linux-2.6.26-rc3-git2/security/inode.c
@@ -20,8 +20,7 @@
#include <linux/init.h>
#include <linux/namei.h>
#include <linux/security.h>
-
-#define SECURITYFS_MAGIC 0x73636673
+#include <linux/magic.h>

static struct vfsmount *mount;
static int mount_count;
Index: linux-2.6.26-rc3-git2/include/linux/magic.h
===================================================================
--- linux-2.6.26-rc3-git2.orig/include/linux/magic.h
+++ linux-2.6.26-rc3-git2/include/linux/magic.h
@@ -6,6 +6,10 @@
#define AFS_SUPER_MAGIC 0x5346414F
#define AUTOFS_SUPER_MAGIC 0x0187
#define CODA_SUPER_MAGIC 0x73757245
+#define DEBUGFS_MAGIC 0x64626720
+#define SYSFS_MAGIC 0x62656572
+#define SECURITYFS_MAGIC 0x73636673
+#define TMPFS_MAGIC 0x01021994
#define EFS_SUPER_MAGIC 0x414A53
#define EXT2_SUPER_MAGIC 0xEF53
#define EXT3_SUPER_MAGIC 0xEF53
Index: linux-2.6.26-rc3-git2/fs/debugfs/inode.c
===================================================================
--- linux-2.6.26-rc3-git2.orig/fs/debugfs/inode.c
+++ linux-2.6.26-rc3-git2/fs/debugfs/inode.c
@@ -26,8 +26,7 @@
#include <linux/debugfs.h>
#include <linux/fsnotify.h>
#include <linux/string.h>
-
-#define DEBUGFS_MAGIC 0x64626720
+#include <linux/magic.h>

static struct vfsmount *debugfs_mount;
static int debugfs_mount_count;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/