Commit 91716322 authored by Matt Fleming's avatar Matt Fleming
Browse files

efivarfs: Add unique magic number 



Using pstore's superblock magic number is no doubt going to cause
problems in the future. Give efivarfs its own magic number.

Acked-by: default avatarJeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent d2923841

drivers/firmware/efivars.c

+1 −1
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent) 
	sb->s_maxbytes          = MAX_LFS_FILESIZE;

	sb->s_blocksize         = PAGE_CACHE_SIZE;

	sb->s_blocksize_bits    = PAGE_CACHE_SHIFT;

	sb->s_magic             = PSTOREFS_MAGIC;

	sb->s_magic             = EFIVARFS_MAGIC;

	sb->s_op                = &efivarfs_ops;

	sb->s_time_gran         = 1;

include/uapi/linux/magic.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#define ISOFS_SUPER_MAGIC	0x9660

#define JFFS2_SUPER_MAGIC	0x72b6

#define PSTOREFS_MAGIC		0x6165676C

#define EFIVARFS_MAGIC		0xde5e81e4



#define MINIX_SUPER_MAGIC	0x137F		/* minix v1 fs, 14 char names */

#define MINIX_SUPER_MAGIC2	0x138F		/* minix v1 fs, 30 char names */

CRA Git | Maintained and supported by SUSTech CRA and CCSE