Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

libceph: remove dead code in osd_req_encode_op()

In osd_req_encode_op() there are a few cases that handle osd
opcodes that are never used in the kernel. The presence of
this code gives the impression it's correct (which really can't
be assumed), and may impose some unnecessary restrictions on
some upcoming refactoring of this code.

So delete this effectively dead code, and report uses of the
previously handled cases as unsupported.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

+5 -26
+5 -26
net/ceph/osd_client.c
··· 231 231 dst->extent.truncate_seq = 232 232 cpu_to_le32(src->extent.truncate_seq); 233 233 break; 234 - 235 - case CEPH_OSD_OP_GETXATTR: 236 - case CEPH_OSD_OP_SETXATTR: 237 - case CEPH_OSD_OP_CMPXATTR: 238 - dst->xattr.name_len = cpu_to_le32(src->xattr.name_len); 239 - dst->xattr.value_len = cpu_to_le32(src->xattr.value_len); 240 - dst->xattr.cmp_op = src->xattr.cmp_op; 241 - dst->xattr.cmp_mode = src->xattr.cmp_mode; 242 - ceph_pagelist_append(&req->r_trail, src->xattr.name, 243 - src->xattr.name_len); 244 - ceph_pagelist_append(&req->r_trail, src->xattr.val, 245 - src->xattr.value_len); 246 - break; 247 234 case CEPH_OSD_OP_CALL: 248 235 dst->cls.class_len = src->cls.class_len; 249 236 dst->cls.method_len = src->cls.method_len; ··· 243 256 ceph_pagelist_append(&req->r_trail, src->cls.indata, 244 257 src->cls.indata_len); 245 258 break; 246 - case CEPH_OSD_OP_ROLLBACK: 247 - dst->snap.snapid = cpu_to_le64(src->snap.snapid); 248 - break; 249 259 case CEPH_OSD_OP_STARTSYNC: 250 260 break; 251 - case CEPH_OSD_OP_NOTIFY: 252 - { 253 - __le32 prot_ver = cpu_to_le32(src->watch.prot_ver); 254 - __le32 timeout = cpu_to_le32(src->watch.timeout); 255 - 256 - ceph_pagelist_append(&req->r_trail, 257 - &prot_ver, sizeof(prot_ver)); 258 - ceph_pagelist_append(&req->r_trail, 259 - &timeout, sizeof(timeout)); 260 - } 261 261 case CEPH_OSD_OP_NOTIFY_ACK: 262 262 case CEPH_OSD_OP_WATCH: 263 263 dst->watch.cookie = cpu_to_le64(src->watch.cookie); ··· 259 285 case CEPH_OSD_OP_MAPEXT: 260 286 case CEPH_OSD_OP_MASKTRUNC: 261 287 case CEPH_OSD_OP_SPARSE_READ: 288 + case CEPH_OSD_OP_NOTIFY: 262 289 case CEPH_OSD_OP_ASSERT_VER: 263 290 case CEPH_OSD_OP_WRITEFULL: 264 291 case CEPH_OSD_OP_TRUNCATE: ··· 272 297 case CEPH_OSD_OP_TMAPPUT: 273 298 case CEPH_OSD_OP_TMAPGET: 274 299 case CEPH_OSD_OP_CREATE: 300 + case CEPH_OSD_OP_ROLLBACK: 275 301 case CEPH_OSD_OP_OMAPGETKEYS: 276 302 case CEPH_OSD_OP_OMAPGETVALS: 277 303 case CEPH_OSD_OP_OMAPGETHEADER: ··· 286 310 case CEPH_OSD_OP_CLONERANGE: 287 311 case CEPH_OSD_OP_ASSERT_SRC_VERSION: 288 312 case CEPH_OSD_OP_SRC_CMPXATTR: 313 + case CEPH_OSD_OP_GETXATTR: 289 314 case CEPH_OSD_OP_GETXATTRS: 315 + case CEPH_OSD_OP_CMPXATTR: 316 + case CEPH_OSD_OP_SETXATTR: 290 317 case CEPH_OSD_OP_SETXATTRS: 291 318 case CEPH_OSD_OP_RESETXATTRS: 292 319 case CEPH_OSD_OP_RMXATTR: