libceph: sync osd op definitions in rados.h

Bring in missing osd ops and strings, use macros to eliminate multiple
points of maintenance.

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

2 files changed, 8 insertions, 132 deletions

diff --git a/net/ceph/ceph_strings.c b/net/ceph/ceph_strings.c
index 1348df96fe15..30560202f57b 100644
--- a/net/ceph/ceph_strings.c
+++ b/net/ceph/ceph_strings.c
@@ -19,77 +19,12 @@ const char *ceph_entity_type_name(int type)
 const char *ceph_osd_op_name(int op)
 {
         switch (op) {
-        case CEPH_OSD_OP_READ: return "read";
-        case CEPH_OSD_OP_STAT: return "stat";
-        case CEPH_OSD_OP_MAPEXT: return "mapext";
-        case CEPH_OSD_OP_SPARSE_READ: return "sparse-read";
-        case CEPH_OSD_OP_NOTIFY: return "notify";
-        case CEPH_OSD_OP_NOTIFY_ACK: return "notify-ack";
-        case CEPH_OSD_OP_ASSERT_VER: return "assert-version";
-
-        case CEPH_OSD_OP_MASKTRUNC: return "masktrunc";
-
-        case CEPH_OSD_OP_CREATE: return "create";
-        case CEPH_OSD_OP_WRITE: return "write";
-        case CEPH_OSD_OP_DELETE: return "delete";
-        case CEPH_OSD_OP_TRUNCATE: return "truncate";
-        case CEPH_OSD_OP_ZERO: return "zero";
-        case CEPH_OSD_OP_WRITEFULL: return "writefull";
-        case CEPH_OSD_OP_ROLLBACK: return "rollback";
-
-        case CEPH_OSD_OP_APPEND: return "append";
-        case CEPH_OSD_OP_STARTSYNC: return "startsync";
-        case CEPH_OSD_OP_SETTRUNC: return "settrunc";
-        case CEPH_OSD_OP_TRIMTRUNC: return "trimtrunc";
-
-        case CEPH_OSD_OP_TMAPUP: return "tmapup";
-        case CEPH_OSD_OP_TMAPGET: return "tmapget";
-        case CEPH_OSD_OP_TMAPPUT: return "tmapput";
-        case CEPH_OSD_OP_WATCH: return "watch";
-
-        case CEPH_OSD_OP_CLONERANGE: return "clonerange";
-        case CEPH_OSD_OP_ASSERT_SRC_VERSION: return "assert-src-version";
-        case CEPH_OSD_OP_SRC_CMPXATTR: return "src-cmpxattr";
-
-        case CEPH_OSD_OP_GETXATTR: return "getxattr";
-        case CEPH_OSD_OP_GETXATTRS: return "getxattrs";
-        case CEPH_OSD_OP_SETXATTR: return "setxattr";
-        case CEPH_OSD_OP_SETXATTRS: return "setxattrs";
-        case CEPH_OSD_OP_RESETXATTRS: return "resetxattrs";
-        case CEPH_OSD_OP_RMXATTR: return "rmxattr";
-        case CEPH_OSD_OP_CMPXATTR: return "cmpxattr";
-
-        case CEPH_OSD_OP_PULL: return "pull";
-        case CEPH_OSD_OP_PUSH: return "push";
-        case CEPH_OSD_OP_BALANCEREADS: return "balance-reads";
-        case CEPH_OSD_OP_UNBALANCEREADS: return "unbalance-reads";
-        case CEPH_OSD_OP_SCRUB: return "scrub";
-        case CEPH_OSD_OP_SCRUB_RESERVE: return "scrub-reserve";
-        case CEPH_OSD_OP_SCRUB_UNRESERVE: return "scrub-unreserve";
-        case CEPH_OSD_OP_SCRUB_STOP: return "scrub-stop";
-        case CEPH_OSD_OP_SCRUB_MAP: return "scrub-map";
-
-        case CEPH_OSD_OP_WRLOCK: return "wrlock";
-        case CEPH_OSD_OP_WRUNLOCK: return "wrunlock";
-        case CEPH_OSD_OP_RDLOCK: return "rdlock";
-        case CEPH_OSD_OP_RDUNLOCK: return "rdunlock";
-        case CEPH_OSD_OP_UPLOCK: return "uplock";
-        case CEPH_OSD_OP_DNLOCK: return "dnlock";
-
-        case CEPH_OSD_OP_CALL: return "call";
-
-        case CEPH_OSD_OP_PGLS: return "pgls";
-        case CEPH_OSD_OP_PGLS_FILTER: return "pgls-filter";
-        case CEPH_OSD_OP_OMAPGETKEYS: return "omap-get-keys";
-        case CEPH_OSD_OP_OMAPGETVALS: return "omap-get-vals";
-        case CEPH_OSD_OP_OMAPGETHEADER: return "omap-get-header";
-        case CEPH_OSD_OP_OMAPGETVALSBYKEYS: return "omap-get-vals-by-keys";
-        case CEPH_OSD_OP_OMAPSETVALS: return "omap-set-vals";
-        case CEPH_OSD_OP_OMAPSETHEADER: return "omap-set-header";
-        case CEPH_OSD_OP_OMAPCLEAR: return "omap-clear";
-        case CEPH_OSD_OP_OMAPRMKEYS: return "omap-rm-keys";
+#define GENERATE_CASE(op, opcode, str)  case CEPH_OSD_OP_##op: return (str);
+__CEPH_FORALL_OSD_OPS(GENERATE_CASE)
+#undef GENERATE_CASE
+        default:
+                return "???";
         }
-        return "???";
 }
 
 const char *ceph_osd_state_name(int s)
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index a528ea34253a..f3fc54eac09d 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -431,68 +431,9 @@ EXPORT_SYMBOL(ceph_osdc_alloc_request);
 static bool osd_req_opcode_valid(u16 opcode)
 {
         switch (opcode) {
-        case CEPH_OSD_OP_READ:
-        case CEPH_OSD_OP_STAT:
-        case CEPH_OSD_OP_MAPEXT:
-        case CEPH_OSD_OP_MASKTRUNC:
-        case CEPH_OSD_OP_SPARSE_READ:
-        case CEPH_OSD_OP_NOTIFY:
-        case CEPH_OSD_OP_NOTIFY_ACK:
-        case CEPH_OSD_OP_ASSERT_VER:
-        case CEPH_OSD_OP_WRITE:
-        case CEPH_OSD_OP_WRITEFULL:
-        case CEPH_OSD_OP_TRUNCATE:
-        case CEPH_OSD_OP_ZERO:
-        case CEPH_OSD_OP_DELETE:
-        case CEPH_OSD_OP_APPEND:
-        case CEPH_OSD_OP_STARTSYNC:
-        case CEPH_OSD_OP_SETTRUNC:
-        case CEPH_OSD_OP_TRIMTRUNC:
-        case CEPH_OSD_OP_TMAPUP:
-        case CEPH_OSD_OP_TMAPPUT:
-        case CEPH_OSD_OP_TMAPGET:
-        case CEPH_OSD_OP_CREATE:
-        case CEPH_OSD_OP_ROLLBACK:
-        case CEPH_OSD_OP_WATCH:
-        case CEPH_OSD_OP_OMAPGETKEYS:
-        case CEPH_OSD_OP_OMAPGETVALS:
-        case CEPH_OSD_OP_OMAPGETHEADER:
-        case CEPH_OSD_OP_OMAPGETVALSBYKEYS:
-        case CEPH_OSD_OP_OMAPSETVALS:
-        case CEPH_OSD_OP_OMAPSETHEADER:
-        case CEPH_OSD_OP_OMAPCLEAR:
-        case CEPH_OSD_OP_OMAPRMKEYS:
-        case CEPH_OSD_OP_OMAP_CMP:
-        case CEPH_OSD_OP_SETALLOCHINT:
-        case CEPH_OSD_OP_CLONERANGE:
-        case CEPH_OSD_OP_ASSERT_SRC_VERSION:
-        case CEPH_OSD_OP_SRC_CMPXATTR:
-        case CEPH_OSD_OP_GETXATTR:
-        case CEPH_OSD_OP_GETXATTRS:
-        case CEPH_OSD_OP_CMPXATTR:
-        case CEPH_OSD_OP_SETXATTR:
-        case CEPH_OSD_OP_SETXATTRS:
-        case CEPH_OSD_OP_RESETXATTRS:
-        case CEPH_OSD_OP_RMXATTR:
-        case CEPH_OSD_OP_PULL:
-        case CEPH_OSD_OP_PUSH:
-        case CEPH_OSD_OP_BALANCEREADS:
-        case CEPH_OSD_OP_UNBALANCEREADS:
-        case CEPH_OSD_OP_SCRUB:
-        case CEPH_OSD_OP_SCRUB_RESERVE:
-        case CEPH_OSD_OP_SCRUB_UNRESERVE:
-        case CEPH_OSD_OP_SCRUB_STOP:
-        case CEPH_OSD_OP_SCRUB_MAP:
-        case CEPH_OSD_OP_WRLOCK:
-        case CEPH_OSD_OP_WRUNLOCK:
-        case CEPH_OSD_OP_RDLOCK:
-        case CEPH_OSD_OP_RDUNLOCK:
-        case CEPH_OSD_OP_UPLOCK:
-        case CEPH_OSD_OP_DNLOCK:
-        case CEPH_OSD_OP_CALL:
-        case CEPH_OSD_OP_PGLS:
-        case CEPH_OSD_OP_PGLS_FILTER:
-                return true;
+#define GENERATE_CASE(op, opcode, str)  case CEPH_OSD_OP_##op: return true;
+__CEPH_FORALL_OSD_OPS(GENERATE_CASE)
+#undef GENERATE_CASE
         default:
                 return false;
         }