ceph: clean up kick_flushing_inode_caps()

The last thing that this function does is release i_ceph_lock, so
have the caller do that instead. Add a lockdep assertion to
ensure that the function is always called with i_ceph_lock held.
Change the prototype to take a ceph_inode_info pointer and drop
the separate mdsc argument as we can get that from the session.

While at it, make it non-static.  We'll need this to kick any
flushing caps once the create reply comes in.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index d057173..9fa2f87 100644 (file)
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2474,16 +2474,15 @@ void ceph_kick_flushing_caps(struct ceph_mds_client *mdsc,
        }
 }
 
-static void kick_flushing_inode_caps(struct ceph_mds_client *mdsc,
-                                    struct ceph_mds_session *session,
-                                    struct inode *inode)
-       __releases(ci->i_ceph_lock)
+void ceph_kick_flushing_inode_caps(struct ceph_mds_session *session,
+                                  struct ceph_inode_info *ci)
 {
-       struct ceph_inode_info *ci = ceph_inode(inode);
-       struct ceph_cap *cap;
+       struct ceph_mds_client *mdsc = session->s_mdsc;
+       struct ceph_cap *cap = ci->i_auth_cap;
+
+       lockdep_assert_held(&ci->i_ceph_lock);
 
-       cap = ci->i_auth_cap;
-       dout("kick_flushing_inode_caps %p flushing %s\n", inode,
+       dout("%s %p flushing %s\n", __func__, &ci->vfs_inode,
             ceph_cap_string(ci->i_flushing_caps));
 
        if (!list_empty(&ci->i_cap_flush_list)) {
@@ -2495,9 +2494,6 @@ static void kick_flushing_inode_caps(struct ceph_mds_client *mdsc,
                spin_unlock(&mdsc->cap_dirty_lock);
 
                __kick_flushing_caps(mdsc, session, ci, oldest_flush_tid);
-               spin_unlock(&ci->i_ceph_lock);
-       } else {
-               spin_unlock(&ci->i_ceph_lock);
        }
 }
 
@@ -3366,7 +3362,8 @@ static void handle_cap_grant(struct inode *inode,
        if (le32_to_cpu(grant->op) == CEPH_CAP_OP_IMPORT) {
                if (newcaps & ~extra_info->issued)
                        wake = true;
-               kick_flushing_inode_caps(session->s_mdsc, session, inode);
+               ceph_kick_flushing_inode_caps(session, ci);
+               spin_unlock(&ci->i_ceph_lock);
                up_read(&session->s_mdsc->snap_rwsem);
        } else {
                spin_unlock(&ci->i_ceph_lock);

diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 37dc1ac..b2711ee 100644 (file)
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -1048,6 +1048,8 @@ extern void ceph_early_kick_flushing_caps(struct ceph_mds_client *mdsc,
                                          struct ceph_mds_session *session);
 extern void ceph_kick_flushing_caps(struct ceph_mds_client *mdsc,
                                    struct ceph_mds_session *session);
+void ceph_kick_flushing_inode_caps(struct ceph_mds_session *session,
+                                  struct ceph_inode_info *ci);
 extern struct ceph_cap *ceph_get_cap_for_mds(struct ceph_inode_info *ci,
                                             int mds);
 extern void ceph_get_cap_refs(struct ceph_inode_info *ci, int caps);