Commit a0b3a15e authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: move CEPH_SUPER_MAGIC definition to magic.h 



The uapi headers are missing the ceph definition. Move it there so
userland apps can ID cephfs.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 76bdbc7a

fs/ceph/super.c

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <linux/ceph/auth.h>

#include <linux/ceph/debugfs.h>



#include <uapi/linux/magic.h>



static DEFINE_SPINLOCK(ceph_fsc_lock);

static LIST_HEAD(ceph_fsc_list);

fs/ceph/super.h

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ 
#include <linux/fscache.h>

#endif



/* f_type in struct statfs */

#define CEPH_SUPER_MAGIC 0x00c36400



/* large granularity for statfs utilization stats to facilitate

 * large volume sizes on 32-bit machines. */

#define CEPH_BLOCK_SHIFT   22  /* 4 MB */

include/uapi/linux/magic.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#define AFFS_SUPER_MAGIC	0xadff

#define AFS_SUPER_MAGIC                0x5346414F

#define AUTOFS_SUPER_MAGIC	0x0187

#define CEPH_SUPER_MAGIC	0x00c36400

#define CODA_SUPER_MAGIC	0x73757245

#define CRAMFS_MAGIC		0x28cd3d45	/* some random number */

#define CRAMFS_MAGIC_WEND	0x453dcd28	/* magic number with the wrong endianess */