1 files changed, 5 insertions, 5 deletions

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index d3b9c9d5c1bd..f5a38910a82b 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1058,6 +1058,11 @@ void __ceph_remove_cap(struct ceph_cap *cap, bool queue_release)
 
         dout("__ceph_remove_cap %p from %p\n", cap, &ci->vfs_inode);
 
+        /* remove from inode's cap rbtree, and clear auth cap */
+        rb_erase(&cap->ci_node, &ci->i_caps);
+        if (ci->i_auth_cap == cap)
+                ci->i_auth_cap = NULL;
+
         /* remove from session list */
         spin_lock(&session->s_cap_lock);
         if (session->s_cap_iterator == cap) {
@@ -1091,11 +1096,6 @@ void __ceph_remove_cap(struct ceph_cap *cap, bool queue_release)
 
         spin_unlock(&session->s_cap_lock);
 
-        /* remove from inode list */
-        rb_erase(&cap->ci_node, &ci->i_caps);
-        if (ci->i_auth_cap == cap)
-                ci->i_auth_cap = NULL;
-
         if (removed)
                 ceph_put_cap(mdsc, cap);