Merge tag 'ceph-for-4.17-rc1' of git://github.com/ceph/ceph-client

[sfrench/cifs-2.6.git] / net / ceph / ceph_common.c

diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 4adf07826f4a33086bbc78ce6e6142311fac8d8b..584fdbef2088cf7eaa6ad8fea103dc6aa42b6ce9 100644 (file)
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -72,6 +72,7 @@ const char *ceph_msg_type_name(int type)
        case CEPH_MSG_MON_GET_VERSION: return "mon_get_version";
        case CEPH_MSG_MON_GET_VERSION_REPLY: return "mon_get_version_reply";
        case CEPH_MSG_MDS_MAP: return "mds_map";
+       case CEPH_MSG_FS_MAP_USER: return "fs_map_user";
        case CEPH_MSG_CLIENT_SESSION: return "client_session";
        case CEPH_MSG_CLIENT_RECONNECT: return "client_reconnect";
        case CEPH_MSG_CLIENT_REQUEST: return "client_request";
@@ -79,8 +80,13 @@ const char *ceph_msg_type_name(int type)
        case CEPH_MSG_CLIENT_REPLY: return "client_reply";
        case CEPH_MSG_CLIENT_CAPS: return "client_caps";
        case CEPH_MSG_CLIENT_CAPRELEASE: return "client_cap_release";
+       case CEPH_MSG_CLIENT_QUOTA: return "client_quota";
        case CEPH_MSG_CLIENT_SNAP: return "client_snap";
        case CEPH_MSG_CLIENT_LEASE: return "client_lease";
+       case CEPH_MSG_POOLOP_REPLY: return "poolop_reply";
+       case CEPH_MSG_POOLOP: return "poolop";
+       case CEPH_MSG_MON_COMMAND: return "mon_command";
+       case CEPH_MSG_MON_COMMAND_ACK: return "mon_command_ack";
        case CEPH_MSG_OSD_MAP: return "osd_map";
        case CEPH_MSG_OSD_OP: return "osd_op";
        case CEPH_MSG_OSD_OPREPLY: return "osd_opreply";
@@ -217,7 +223,7 @@ static int parse_fsid(const char *str, struct ceph_fsid *fsid)
 
        if (i == 16)
                err = 0;
-       dout("parse_fsid ret %d got fsid %pU", err, fsid);
+       dout("parse_fsid ret %d got fsid %pU\n", err, fsid);
        return err;
 }