From b93918f8e447d1a98b807c015fe1501e4f7e489d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 29 May 2009 17:32:42 -0700 Subject: [PATCH] osd: cleanup types --- src/include/ceph_fs.h | 2 +- src/include/rados.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h index a8e8bce259471..46ec816d010a9 100644 --- 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 fafc7adba8a26..1b2c18a11cff4 100644 --- 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)); -- 2.39.5