From 5ea618a926952a9378990e261ff1bed4a4ec355e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 31 Jul 2015 09:16:11 -0400 Subject: [PATCH] include/rados: remove op definitions for LOCK ops These haven't been used in many many years. They can safely be removed and the ids reused since no deployed code is anywhere near old enough to use any of it. Signed-off-by: Sage Weil --- src/include/rados.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/include/rados.h b/src/include/rados.h index 424bef173b93..163bd9c311b3 100644 --- a/src/include/rados.h +++ b/src/include/rados.h @@ -165,7 +165,6 @@ extern const char *ceph_osd_state_name(int s); #define CEPH_OSD_OP_MODE_CACHE 0x8000 #define CEPH_OSD_OP_TYPE 0x0f00 -#define CEPH_OSD_OP_TYPE_LOCK 0x0100 #define CEPH_OSD_OP_TYPE_DATA 0x0200 #define CEPH_OSD_OP_TYPE_ATTR 0x0300 #define CEPH_OSD_OP_TYPE_EXEC 0x0400 @@ -279,14 +278,6 @@ extern const char *ceph_osd_state_name(int s); f(SCRUB_STOP, __CEPH_OSD_OP1(SUB, 8), "scrub-stop") \ f(SCRUB_MAP, __CEPH_OSD_OP1(SUB, 9), "scrub-map") \ \ - /** lock **/ \ - f(WRLOCK, __CEPH_OSD_OP(WR, LOCK, 1), "wrlock") \ - f(WRUNLOCK, __CEPH_OSD_OP(WR, LOCK, 2), "wrunlock") \ - f(RDLOCK, __CEPH_OSD_OP(WR, LOCK, 3), "rdlock") \ - f(RDUNLOCK, __CEPH_OSD_OP(WR, LOCK, 4), "rdunlock") \ - f(UPLOCK, __CEPH_OSD_OP(WR, LOCK, 5), "uplock") \ - f(DNLOCK, __CEPH_OSD_OP(WR, LOCK, 6), "dnlock") \ - \ /** exec **/ \ /* note: the RD bit here is wrong; see special-case below in helper */ \ f(CALL, __CEPH_OSD_OP(RD, EXEC, 1), "call") \ @@ -305,10 +296,6 @@ __CEPH_FORALL_OSD_OPS(GENERATE_ENUM_ENTRY) #undef GENERATE_ENUM_ENTRY }; -static inline int ceph_osd_op_type_lock(int op) -{ - return (op & CEPH_OSD_OP_TYPE) == CEPH_OSD_OP_TYPE_LOCK; -} static inline int ceph_osd_op_type_data(int op) { return (op & CEPH_OSD_OP_TYPE) == CEPH_OSD_OP_TYPE_DATA; -- 2.47.3