On Mon, Dec 22, 2014 at 5:35 PM, Sage Weil <sage@newdream.net> wrote: > On Mon, 22 Dec 2014, Ilya Dryomov wrote: >> Actually, pool op stuff has been unused for over two years - looks like >> it was added for rbd create_snap and that got ripped out in 2012. It's >> unlikely we'd ever need to manage pools or snaps from the kernel client >> so I think it makes sense to nuke it. Sage? > > Yep!
Showing the changes to include/linux/ceph (2 of 5 files). Show all
Unified · Split
| @@ -158,17 +158,6 @@ enum { · 157 unmodified lines | ||
| 158 | 158 | }; |
| 159 | 159 | |
| 160 | 160 | |
| 161 | −/* pool operations */ | |
| 162 | −enum { | |
| 163 | − POOL_OP_CREATE = 0x01, | |
| 164 | − POOL_OP_DELETE = 0x02, | |
| 165 | − POOL_OP_AUID_CHANGE = 0x03, | |
| 166 | − POOL_OP_CREATE_SNAP = 0x11, | |
| 167 | − POOL_OP_DELETE_SNAP = 0x12, | |
| 168 | − POOL_OP_CREATE_UNMANAGED_SNAP = 0x21, | |
| 169 | − POOL_OP_DELETE_UNMANAGED_SNAP = 0x22, | |
| 170 | −}; | |
| 171 | − | |
| 172 | 161 | struct ceph_mon_request_header { |
| 173 | 162 | __le64 have_version; |
| 174 | 163 | __le16 session_mon; |
| @@ -191,31 +180,6 @@ struct ceph_mon_statfs_reply { · 16 unmodified lines | ||
| 191 | 180 | struct ceph_statfs st; |
| 192 | 181 | } __attribute__ ((packed)); |
| 193 | 182 | |
| 194 | −const char *ceph_pool_op_name(int op); | |
| 195 | − | |
| 196 | −struct ceph_mon_poolop { | |
| 197 | − struct ceph_mon_request_header monhdr; | |
| 198 | − struct ceph_fsid fsid; | |
| 199 | − __le32 pool; | |
| 200 | − __le32 op; | |
| 201 | − __le64 auid; | |
| 202 | − __le64 snapid; | |
| 203 | − __le32 name_len; | |
| 204 | −} __attribute__ ((packed)); | |
| 205 | − | |
| 206 | −struct ceph_mon_poolop_reply { | |
| 207 | − struct ceph_mon_request_header monhdr; | |
| 208 | − struct ceph_fsid fsid; | |
| 209 | − __le32 reply_code; | |
| 210 | − __le32 epoch; | |
| 211 | − char has_data; | |
| 212 | − char data[0]; | |
| 213 | −} __attribute__ ((packed)); | |
| 214 | − | |
| 215 | −struct ceph_mon_unmanaged_snap { | |
| 216 | − __le64 snapid; | |
| 217 | −} __attribute__ ((packed)); | |
| 218 | − | |
| 219 | 183 | struct ceph_osd_getmap { |
| 220 | 184 | struct ceph_mon_request_header monhdr; |
| 221 | 185 | struct ceph_fsid fsid; |
| @@ -40,7 +40,7 @@ struct ceph_mon_request { · 39 unmodified lines | ||
| 40 | 40 | }; |
| 41 | 41 | |
| 42 | 42 | /* |
| 43 | − * ceph_mon_generic_request is being used for the statfs, poolop and | |
| 43 | + * ceph_mon_generic_request is being used for the statfs and | |
| 44 | 44 | * mon_get_version requests which are being done a bit differently |
| 45 | 45 | * because we need to get data back to the caller |
| 46 | 46 | */ |
| @@ -50,7 +50,6 @@ struct ceph_mon_generic_request { · 3 unmodified lines | ||
| 50 | 50 | struct rb_node node; |
| 51 | 51 | int result; |
| 52 | 52 | void *buf; |
| 53 | − int buf_len; | |
| 54 | 53 | struct completion completion; |
| 55 | 54 | struct ceph_msg *request; /* original request */ |
| 56 | 55 | struct ceph_msg *reply; /* and reply */ |
| @@ -117,10 +116,4 @@ extern int ceph_monc_open_session(struct ceph_mon_client *monc); · 60 unmodified lines | ||
| 117 | 116 | |
| 118 | 117 | extern int ceph_monc_validate_auth(struct ceph_mon_client *monc); |
| 119 | 118 | |
| 120 | −extern int ceph_monc_create_snapid(struct ceph_mon_client *monc, | |
| 121 | − u32 pool, u64 *snapid); | |
| 122 | − | |
| 123 | −extern int ceph_monc_delete_snapid(struct ceph_mon_client *monc, | |
| 124 | − u32 pool, u64 snapid); | |
| 125 | − | |
| 126 | 119 | #endif |