* [RFC][Patch 3/5] integrity: special fs magic
@ 2008-05-23 15:05 Mimi Zohar
0 siblings, 0 replies; 3+ messages in thread
From: Mimi Zohar @ 2008-05-23 15:05 UTC (permalink / raw)
To: linux-kernel
Cc: safford, serue, sailer, zohar, Stephen Smalley, CaseySchaufler
- Move special fs magic number definitions to magic.h
- Add magic.h include
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
---
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;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RFC][PATCH 3/5] integrity: special fs magic
2008-06-27 16:22 ` [RFC][PATCH " Mimi Zohar
@ 2008-06-30 10:06 ` James Morris
0 siblings, 0 replies; 3+ messages in thread
From: James Morris @ 2008-06-30 10:06 UTC (permalink / raw)
To: Mimi Zohar
Cc: linux-kernel, David Safford, Serge Hallyn, Reiner Sailer, Mimi Zohar
On Fri, 27 Jun 2008, Mimi Zohar wrote:
> - Move special fs magic number definitions to magic.h
> - Add magic.h include
>
> Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Reviewed-by: James Morris <jmorris@namei.org>
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [RFC][PATCH 3/5] integrity: special fs magic
[not found] <20080627131946.225566613@linux.vnet.ibm.com>
@ 2008-06-27 16:22 ` Mimi Zohar
2008-06-30 10:06 ` James Morris
0 siblings, 1 reply; 3+ messages in thread
From: Mimi Zohar @ 2008-06-27 16:22 UTC (permalink / raw)
To: linux-kernel; +Cc: David Safford, Serge Hallyn, Reiner Sailer, Mimi Zohar
- Move special fs magic number definitions to magic.h
- Add magic.h include
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
---
Index: linux-2.6.26-rc8/mm/shmem.c
===================================================================
--- linux-2.6.26-rc8.orig/mm/shmem.c
+++ linux-2.6.26-rc8/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-rc8/security/inode.c
===================================================================
--- linux-2.6.26-rc8.orig/security/inode.c
+++ linux-2.6.26-rc8/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-rc8/include/linux/magic.h
===================================================================
--- linux-2.6.26-rc8.orig/include/linux/magic.h
+++ linux-2.6.26-rc8/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-rc8/fs/debugfs/inode.c
===================================================================
--- linux-2.6.26-rc8.orig/fs/debugfs/inode.c
+++ linux-2.6.26-rc8/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;
--
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-06-30 10:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-05-23 15:05 [RFC][Patch 3/5] integrity: special fs magic Mimi Zohar
[not found] <20080627131946.225566613@linux.vnet.ibm.com>
2008-06-27 16:22 ` [RFC][PATCH " Mimi Zohar
2008-06-30 10:06 ` James Morris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®