diff options
| author | Yan, Zheng <zyan@redhat.com> | 2016-04-06 23:34:43 -0400 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-07-27 21:00:40 -0400 |
| commit | 0cabbd94ff52c4803fc0ad9ad0ad5e43df493ab0 (patch) | |
| tree | 9e955af90b3d02e0842ceac14dda9fc87d0a5622 /include/linux/ceph | |
| parent | f49d1e058d23a5fabeb1499be739af8b3db52164 (diff) | |
libceph: fsmap.user subscription support
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'include/linux/ceph')
| -rw-r--r-- | include/linux/ceph/ceph_fs.h | 1 | ||||
| -rw-r--r-- | include/linux/ceph/mon_client.h | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/ceph/ceph_fs.h b/include/linux/ceph/ceph_fs.h index 6bc7730d22ac..7868d602c0a0 100644 --- a/include/linux/ceph/ceph_fs.h +++ b/include/linux/ceph/ceph_fs.h | |||
| @@ -121,6 +121,7 @@ struct ceph_dir_layout { | |||
| 121 | 121 | ||
| 122 | /* client <-> mds */ | 122 | /* client <-> mds */ |
| 123 | #define CEPH_MSG_MDS_MAP 21 | 123 | #define CEPH_MSG_MDS_MAP 21 |
| 124 | #define CEPH_MSG_FS_MAP_USER 103 | ||
| 124 | 125 | ||
| 125 | #define CEPH_MSG_CLIENT_SESSION 22 | 126 | #define CEPH_MSG_CLIENT_SESSION 22 |
| 126 | #define CEPH_MSG_CLIENT_RECONNECT 23 | 127 | #define CEPH_MSG_CLIENT_RECONNECT 23 |
diff --git a/include/linux/ceph/mon_client.h b/include/linux/ceph/mon_client.h index e2a92df08b47..24d704d1ea5c 100644 --- a/include/linux/ceph/mon_client.h +++ b/include/linux/ceph/mon_client.h | |||
| @@ -95,7 +95,7 @@ struct ceph_mon_client { | |||
| 95 | struct ceph_mon_subscribe_item item; | 95 | struct ceph_mon_subscribe_item item; |
| 96 | bool want; | 96 | bool want; |
| 97 | u32 have; /* epoch */ | 97 | u32 have; /* epoch */ |
| 98 | } subs[3]; | 98 | } subs[4]; |
| 99 | int fs_cluster_id; /* "mdsmap.<id>" sub */ | 99 | int fs_cluster_id; /* "mdsmap.<id>" sub */ |
| 100 | 100 | ||
| 101 | #ifdef CONFIG_DEBUG_FS | 101 | #ifdef CONFIG_DEBUG_FS |
| @@ -111,9 +111,10 @@ extern int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl); | |||
| 111 | extern void ceph_monc_stop(struct ceph_mon_client *monc); | 111 | extern void ceph_monc_stop(struct ceph_mon_client *monc); |
| 112 | 112 | ||
| 113 | enum { | 113 | enum { |
| 114 | CEPH_SUB_MDSMAP = 0, | 114 | CEPH_SUB_MONMAP = 0, |
| 115 | CEPH_SUB_MONMAP, | ||
| 116 | CEPH_SUB_OSDMAP, | 115 | CEPH_SUB_OSDMAP, |
| 116 | CEPH_SUB_FSMAP, | ||
| 117 | CEPH_SUB_MDSMAP, | ||
| 117 | }; | 118 | }; |
| 118 | 119 | ||
| 119 | extern const char *ceph_sub_str[]; | 120 | extern const char *ceph_sub_str[]; |
