From: Sage Weil <sage@redhat.com>
Date: Thu, 22 Sep 2016 16:39:31 +0000 (-0400)
Subject: cls_lock: encode client-facing addrs with client features
X-Git-Tag: v11.1.0~515^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9cd59b27c56df31ad7e3ebfe57ac20c3dfd0bbf6;p=ceph.git

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 <sage@redhat.com>
---

diff --git a/src/cls/lock/cls_lock.cc b/src/cls/lock/cls_lock.cc
index c8f3359cee55..179c1d3f2bc1 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;
 }