diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 11:13:19 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 11:13:19 -0400 |
commit | e18fa700c9a31360bc8f193aa543b7ef7b39a06b (patch) | |
tree | 1006f53177341c614d4aeb6c96e2e8f3859b5f52 /include/linux/reiserfs_fs.h | |
parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
download | op-kernel-dev-e18fa700c9a31360bc8f193aa543b7ef7b39a06b.zip op-kernel-dev-e18fa700c9a31360bc8f193aa543b7ef7b39a06b.tar.gz |
Move several *_SUPER_MAGIC symbols to include/linux/magic.h.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include/linux/reiserfs_fs.h')
-rw-r--r-- | include/linux/reiserfs_fs.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h index daa2d83..28493ff 100644 --- a/include/linux/reiserfs_fs.h +++ b/include/linux/reiserfs_fs.h @@ -12,6 +12,8 @@ #define _LINUX_REISER_FS_H #include <linux/types.h> +#include <linux/magic.h> + #ifdef __KERNEL__ #include <linux/slab.h> #include <linux/interrupt.h> @@ -227,14 +229,6 @@ struct reiserfs_super_block { ((!is_reiserfs_jr(SB_DISK_SUPER_BLOCK(s)) ? \ SB_ONDISK_JOURNAL_SIZE(s) + 1 : SB_ONDISK_RESERVED_FOR_JOURNAL(s))) - /* used by gcc */ -#define REISERFS_SUPER_MAGIC 0x52654973 - /* used by file system utilities that - look at the superblock, etc. */ -#define REISERFS_SUPER_MAGIC_STRING "ReIsErFs" -#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" -#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs" - int is_reiserfs_3_5(struct reiserfs_super_block *rs); int is_reiserfs_3_6(struct reiserfs_super_block *rs); int is_reiserfs_jr(struct reiserfs_super_block *rs); |