From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 21 Jul 2016 08:09:03 +0000 (+0800)
Subject: client: fix Client::encode_inode_release()
X-Git-Tag: v11.0.1~136^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0eac66a37a6ff9f3002dffc2703a9de1dc164e43;p=ceph.git

client: fix Client::encode_inode_release()

it should return true when release was added to mds request.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 0145925f035f..a47cd58cdf92 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -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;