]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
client: fix Client::encode_inode_release()
authorYan, Zheng <zyan@redhat.com>
Thu, 21 Jul 2016 08:09:03 +0000 (16:09 +0800)
committerYan, Zheng <zyan@redhat.com>
Fri, 22 Jul 2016 02:24:41 +0000 (10:24 +0800)
it should return true when release was added to mds request.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
src/client/Client.cc

index 0145925f035f9f8e13aee7188faf38fb60d91158..a47cd58cdf92c120f799d5ed3b0fec76ad272f36 100644 (file)
@@ -1811,10 +1811,11 @@ int Client::encode_inode_release(Inode *in, MetaRequest *req,
       caps->issued &= ~drop;
       caps->implemented &= ~drop;
       released = 1;
-      force = 1;
       ldout(cct, 25) << "Now have: " << ccap_string(caps->issued) << dendl;
+    } else {
+      released = force;
     }
-    if (force) {
+    if (released) {
       ceph_mds_request_release rel;
       rel.ino = in->ino;
       rel.cap_id = caps->cap_id;