linux-kernel - [PATCH 06/11 linux-next] jfs: 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]

Date:   Sun, 21 May 2017 17:41:46 +0200
From:   Fabian Frederick <fabf@...net.be>
To:     Alexander Viro <viro@...iv.linux.org.uk>
Cc:     Dave Kleikamp <shaggy@...nel.org>,
        jfs-discussion@...ts.sourceforge.net,
        linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org,
        fabf@...net.be
Subject: [PATCH 06/11 linux-next] jfs: 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/jfs/jfs_incore.h        | 6 +-----
 include/uapi/linux/magic.h | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index 1f26d19..64b9152 100644
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -23,16 +23,12 @@
 #include <linux/rwsem.h>
 #include <linux/slab.h>
 #include <linux/bitops.h>
+#include <linux/magic.h>
 #include "jfs_types.h"
 #include "jfs_xtree.h"
 #include "jfs_dtree.h"
 
 /*
- * JFS magic number
- */
-#define JFS_SUPER_MAGIC 0x3153464a /* "JFS1" */
-
-/*
  * JFS-private inode information
  */
 struct jfs_inode_info {
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index b651a02..905eaa2 100644
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -34,6 +34,7 @@
 #define HPFS_SUPER_MAGIC	0xf995e849
 #define HUGETLBFS_MAGIC		0x958458f6	/* some random number */
 #define ISOFS_SUPER_MAGIC	0x9660
+#define JFS_SUPER_MAGIC		0x3153464a	/* "JFS1" */
 #define JFFS2_SUPER_MAGIC	0x72b6
 #define MINIX2_SUPER_MAGIC	0x2468		/* minix v2 fs, 14 char names */
 #define MINIX2_SUPER_MAGIC2	0x2478		/* minix v2 fs, 30 char names */
-- 
2.9.3