From 9cd59b27c56df31ad7e3ebfe57ac20c3dfd0bbf6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 22 Sep 2016 12:39:31 -0400 Subject: [PATCH] cls_lock: encode client-facing addrs with client features This struct goes back to the client, not to disk. This was done incorrectly in e40dd920dc2c3f685bb0ae6a0ecda6792afab18f. Signed-off-by: Sage Weil --- src/cls/lock/cls_lock.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cls/lock/cls_lock.cc b/src/cls/lock/cls_lock.cc index c8f3359cee55a..179c1d3f2bc12 100644 --- a/src/cls/lock/cls_lock.cc +++ b/src/cls/lock/cls_lock.cc @@ -131,7 +131,7 @@ static int write_lock(cls_method_context_t hctx, const string& name, const lock_ key.append(name); bufferlist lock_bl; - ::encode(lock, lock_bl, cls_get_features(hctx)); + ::encode(lock, lock_bl, cls_get_client_features(hctx)); int r = cls_cxx_setxattr(hctx, key.c_str(), &lock_bl); if (r < 0) @@ -398,7 +398,7 @@ static int get_info(cls_method_context_t hctx, bufferlist *in, bufferlist *out) ret.lock_type = linfo.lock_type; ret.tag = linfo.tag; - ::encode(ret, *out, cls_get_features(hctx)); + ::encode(ret, *out, cls_get_client_features(hctx)); return 0; } -- 2.39.5