linux-kernel - [PATCH 02/11 linux-next] exofs: use magic.h

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20170521154031.26761-1-fabf@skynet.be>
Date:   Sun, 21 May 2017 17:40:31 +0200
From:   Fabian Frederick <fabf@...net.be>
To:     Alexander Viro <viro@...iv.linux.org.uk>
Cc:     Boaz Harrosh <ooo@...ctrozaur.com>, linux-fsdevel@...r.kernel.org,
        linux-kernel@...r.kernel.org, fabf@...net.be
Subject: [PATCH 02/11 linux-next] exofs: use magic.h

Filesystems generally use SUPER_MAGIC values from magic.h
instead of a local definition.

Signed-off-by: Fabian Frederick <fabf@...net.be>
---
 fs/exofs/common.h          | 6 +-----
 include/uapi/linux/magic.h | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/exofs/common.h b/fs/exofs/common.h
index 7d88ef5..fb988f9 100644
--- a/fs/exofs/common.h
+++ b/fs/exofs/common.h
@@ -37,6 +37,7 @@
 #define __EXOFS_COM_H__
 
 #include <linux/types.h>
+#include <linux/magic.h>
 
 #include <scsi/osd_attributes.h>
 #include <scsi/osd_initiator.h>
@@ -79,11 +80,6 @@ enum {
 #define EXOFS_BLKSHIFT	12
 #define EXOFS_BLKSIZE	(1UL << EXOFS_BLKSHIFT)
 
-/****************************************************************************
- * superblock-related things
- ****************************************************************************/
-#define EXOFS_SUPER_MAGIC	0x5DF5
-
 /*
  * The file system control block - stored in object EXOFS_SUPER_ID's data.
  * This is where the in-memory superblock is stored on disk.
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index e3bb43b..1265355 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -26,6 +26,7 @@
 #define EXT2_SUPER_MAGIC	0xEF53
 #define EXT3_SUPER_MAGIC	0xEF53
 #define EXT4_SUPER_MAGIC	0xEF53
+#define EXOFS_SUPER_MAGIC	0x5DF5
 #define F2FS_SUPER_MAGIC	0xF2F52010
 #define FUTEXFS_SUPER_MAGIC	0xBAD1DEA
 #define HOSTFS_SUPER_MAGIC	0x00c0ffee
-- 
2.9.3