From: Sage Weil <sage@newdream.net>
Date: Fri, 13 Mar 2009 20:42:30 +0000 (-0700)
Subject: kclient: show wanted in trim_rdcaps
X-Git-Tag: v0.7.1^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c2ee410eeaec387a5665dd39800f9a29222a1c1;p=ceph.git

kclient: show wanted in trim_rdcaps

To aid debugging.  Also, get function call out of BUG_ON argument.
---

diff --git a/src/kernel/caps.c b/src/kernel/caps.c
index 8682c6a85010..293a6e34c0ef 100644
--- a/src/kernel/caps.c
+++ b/src/kernel/caps.c
@@ -1851,9 +1851,12 @@ void ceph_trim_session_rdcaps(struct ceph_mds_session *session)
 			     inode, cap, cap->expires, jiffies);
 			spin_unlock(&inode->i_lock);
 		} else {
-			dout(20, " dropping %p cap %p %s\n", inode, cap,
-			     ceph_cap_string(cap->issued));
-			BUG_ON(__ceph_caps_wanted(cap->ci));
+			int wanted = __ceph_caps_wanted(cap->ci);
+
+			dout(20, " dropping %p cap %p %s wanted %s\n", inode,
+			     cap, ceph_cap_string(cap->issued),
+			     ceph_cap_string(wanted));
+			BUG_ON(wanted);
 			last_cap = __ceph_remove_cap(cap);
 			spin_unlock(&inode->i_lock);
 			if (last_cap)