]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cls_lock: encode client-facing addrs with client features
authorSage Weil <sage@redhat.com>
Thu, 22 Sep 2016 16:39:31 +0000 (12:39 -0400)
committerSage Weil <sage@redhat.com>
Tue, 18 Oct 2016 20:40:12 +0000 (16:40 -0400)
This struct goes back to the client, not to disk.  This was done
incorrectly in e40dd920dc2c3f685bb0ae6a0ecda6792afab18f.

Signed-off-by: Sage Weil <sage@redhat.com>
src/cls/lock/cls_lock.cc

index c8f3359cee55a1c59c090341d62c61fb9a12a3f4..179c1d3f2bc124a6ce5330e9ed6e00414f99bbfb 100644 (file)
@@ -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;
 }