From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 29 Mar 2016 13:50:58 +0000 (+0800)
Subject: client: pass 'newly issued caps' to Client::check_cap_issue()
X-Git-Tag: v10.1.2~3^2^2~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dad3b846201bdb8e1b304baba4f6ae1bdba05bfd;p=ceph.git

client: pass 'newly issued caps' to Client::check_cap_issue()

Client::check_cap_issue() expects caller to pass 'newly issued caps'
to it. But in Client::check_cap_issue(), varible 'issued' is caps
client alread has.

Fixes: http://tracker.ceph.com/issues/15303
Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 177a61e937b8..a572721d5328 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -4807,7 +4807,7 @@ void Client::handle_cap_grant(MetaSession *session, Inode *in, Cap *cap, MClient
   if (m->get_op() == CEPH_CAP_OP_IMPORT && m->get_wanted() != wanted)
     check = true;
 
-  check_cap_issue(in, cap, issued);
+  check_cap_issue(in, cap, new_caps);
 
   // update caps
   if (old_caps & ~new_caps) {