Skip to content

Commit a0b3a15

Browse files
jtlaytonidryomov
authored andcommitted
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: Jeff Layton <[email protected]> Reviewed-by: Ilya Dryomov <[email protected]> Signed-off-by: Ilya Dryomov <[email protected]>
1 parent 76bdbc7 commit a0b3a15

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

fs/ceph/super.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#include <linux/ceph/auth.h>
2828
#include <linux/ceph/debugfs.h>
2929

30+
#include <uapi/linux/magic.h>
31+
3032
static DEFINE_SPINLOCK(ceph_fsc_lock);
3133
static LIST_HEAD(ceph_fsc_list);
3234

fs/ceph/super.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
#include <linux/fscache.h>
2626
#endif
2727

28-
/* f_type in struct statfs */
29-
#define CEPH_SUPER_MAGIC 0x00c36400
30-
3128
/* large granularity for statfs utilization stats to facilitate
3229
* large volume sizes on 32-bit machines. */
3330
#define CEPH_BLOCK_SHIFT 22 /* 4 MB */

include/uapi/linux/magic.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#define AFFS_SUPER_MAGIC 0xadff
77
#define AFS_SUPER_MAGIC 0x5346414F
88
#define AUTOFS_SUPER_MAGIC 0x0187
9+
#define CEPH_SUPER_MAGIC 0x00c36400
910
#define CODA_SUPER_MAGIC 0x73757245
1011
#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
1112
#define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */

0 commit comments

Comments
 (0)