summaryrefslogtreecommitdiffstats
path: root/fs/ceph/ceph_strings.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-05-12 14:48:20 -0700
committerSage Weil <sage@newdream.net>2010-05-17 15:25:38 -0700
commitca9d93a292e327bbcddd8f8ea4197397e35097d4 (patch)
tree30e81e64079228bca30b4b32b5ad4df68eca6dc2 /fs/ceph/ceph_strings.c
parent1a75627896fe67d0124eab6fe2f83dd40188c40c (diff)
downloadblackbird-op-linux-ca9d93a292e327bbcddd8f8ea4197397e35097d4.tar.gz
blackbird-op-linux-ca9d93a292e327bbcddd8f8ea4197397e35097d4.zip
ceph: resync headers with userland
Notable changes include pool op defines and types, FLOCK feature bit, and new CMPXATTR osd ops. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/ceph_strings.c')
-rw-r--r--fs/ceph/ceph_strings.c23
1 files changed, 22 insertions, 1 deletions
diff --git a/fs/ceph/ceph_strings.c b/fs/ceph/ceph_strings.c
index 8e4be6a80c62..78908301ff17 100644
--- a/fs/ceph/ceph_strings.c
+++ b/fs/ceph/ceph_strings.c
@@ -10,7 +10,6 @@ const char *ceph_entity_type_name(int type)
case CEPH_ENTITY_TYPE_OSD: return "osd";
case CEPH_ENTITY_TYPE_MON: return "mon";
case CEPH_ENTITY_TYPE_CLIENT: return "client";
- case CEPH_ENTITY_TYPE_ADMIN: return "admin";
case CEPH_ENTITY_TYPE_AUTH: return "auth";
default: return "unknown";
}
@@ -45,6 +44,7 @@ const char *ceph_osd_op_name(int op)
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";
@@ -174,3 +174,24 @@ const char *ceph_snap_op_name(int o)
}
return "???";
}
+
+const char *ceph_pool_op_name(int op) {
+ switch (op) {
+ case POOL_OP_CREATE:
+ return "create pool";
+ case POOL_OP_DELETE:
+ return "delete pool";
+ case POOL_OP_AUID_CHANGE:
+ return "change auid";
+ case POOL_OP_CREATE_SNAP:
+ return "create snap";
+ case POOL_OP_DELETE_SNAP:
+ return "delete snap";
+ case POOL_OP_CREATE_UNMANAGED_SNAP:
+ return "create unmanaged snap";
+ case POOL_OP_DELETE_UNMANAGED_SNAP:
+ return "delete unmanaged snap";
+ default:
+ return "unknown";
+ }
+}
OpenPOWER on IntegriCloud