| Message ID | 20200915203323.4688-4-idryomov@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | libceph, rbd, ceph: "blacklist" -> "blocklist" | expand |
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index bb2d938a17ac..08f1c0c31dc2 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -3317,6 +3317,10 @@ static int __decode_session_metadata(void **p, void *end, *p += len; ceph_decode_32_safe(p, end, len, bad); ceph_decode_need(p, end, len, bad); + /* + * Match "blocklisted (blacklisted)" from newer MDSes, + * or "blacklisted" from older MDSes. + */ if (err_str && strnstr(*p, "blacklisted", len)) *blocklisted = true; *p += len;
error_string key in the metadata map of MClientSession message is intended for humans, but unfortunately became part of the on-wire format with the introduction of recover_session=clean mode in commit 131d7eb4faa1 ("ceph: auto reconnect after blacklisted"). Signed-off-by: Ilya Dryomov <idryomov@gmail.com> --- fs/ceph/mds_client.c | 4 ++++ 1 file changed, 4 insertions(+)