osd: cleanup types

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index a8e8bce259471889439aa3739e5c67725e888730..46ec816d010a993149e6f07b29d3b2dba5c74cd3 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -26,7 +26,7 @@
 #define CEPH_OSD_PROTOCOL     5 /* cluster internal */
 #define CEPH_MDS_PROTOCOL     9 /* cluster internal */
 #define CEPH_MON_PROTOCOL     4 /* cluster internal */
-#define CEPH_OSDC_PROTOCOL   14 /* public/client */
+#define CEPH_OSDC_PROTOCOL   15 /* public/client */
 #define CEPH_MDSC_PROTOCOL   21 /* public/client */
 #define CEPH_MONC_PROTOCOL   12 /* public/client */
 

diff --git a/src/include/rados.h b/src/include/rados.h
index fafc7adba8a26c16a8abd81d4b8e4bd58babb1be..1b2c18a11cff491bb296fae26e85878989e07d69 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -224,7 +224,6 @@ enum {
 
        /** exec **/
        CEPH_OSD_OP_RDCALL    = CEPH_OSD_OP_MODE_RD | CEPH_OSD_OP_TYPE_EXEC | 1,
-       CEPH_OSD_OP_LOAD_CLASS =  CEPH_OSD_OP_MODE_RD|CEPH_OSD_OP_TYPE_EXEC | 2,
        CEPH_OSD_OP_WRCALL    = CEPH_OSD_OP_MODE_WR | CEPH_OSD_OP_TYPE_EXEC | 1,
 };
 
@@ -368,7 +367,6 @@ struct ceph_osd_request_head {
        __le32 num_snaps;
 
        __le16 num_ops;
-       __u16 object_type;
        struct ceph_osd_op ops[];  /* followed by ticket, snaps */
 } __attribute__ ((packed));