| Message ID | 20170521154146.27592-1-fabf@skynet.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/21/2017 10:41 AM, Fabian Frederick wrote: > Filesystems generally use SUPER_MAGIC values from magic.h > instead of a local definition. > > Signed-off-by: Fabian Frederick <fabf@skynet.be> Acked-by: Dave Kleikamp <dave.kleikamp@oracle.com> > --- > 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 */ >
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 */
Filesystems generally use SUPER_MAGIC values from magic.h instead of a local definition. Signed-off-by: Fabian Frederick <fabf@skynet.be> --- fs/jfs/jfs_incore.h | 6 +----- include/uapi/linux/magic.h | 1 + 2 files changed, 2 insertions(+), 5 deletions(-)