Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 113667
b: refs/heads/master
c: 9256292
h: refs/heads/master
i:
  113665: 7fe7e59
  113663: e6a0e50
v: v3
  • Loading branch information
Mimi Zohar authored and James Morris committed Oct 12, 2008
1 parent fcdc0f5 commit 266d59d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 93db628658197aa46bd7f83d429908b6f187ec9c
refs/heads/master: 92562927826fceb2f8e69c89e28161b8c1e0b125
3 changes: 1 addition & 2 deletions trunk/fs/debugfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions trunk/include/linux/magic.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions trunk/mm/shmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions trunk/security/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 266d59d

Please sign in to comment.