1 files changed, 11 insertions, 5 deletions

diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c
index b26e12cd8ec3..72c6c022f02b 100644
--- a/fs/ceph/snap.c
+++ b/fs/ceph/snap.c
@@ -648,13 +648,15 @@ static void queue_realm_cap_snaps(struct ceph_snap_realm *realm)
                 if (!inode)
                         continue;
                 spin_unlock(&realm->inodes_with_caps_lock);
-                iput(lastinode);
+                /* avoid calling iput_final() while holding
+                 * mdsc->snap_rwsem or in mds dispatch threads */
+                ceph_async_iput(lastinode);
                 lastinode = inode;
                 ceph_queue_cap_snap(ci);
                 spin_lock(&realm->inodes_with_caps_lock);
         }
         spin_unlock(&realm->inodes_with_caps_lock);
-        iput(lastinode);
+        ceph_async_iput(lastinode);
 
         dout("queue_realm_cap_snaps %p %llx done\n", realm, realm->ino);
 }
@@ -806,7 +808,9 @@ static void flush_snaps(struct ceph_mds_client *mdsc)
                 ihold(inode);
                 spin_unlock(&mdsc->snap_flush_lock);
                 ceph_flush_snaps(ci, &session);
-                iput(inode);
+                /* avoid calling iput_final() while holding
+                 * session->s_mutex or in mds dispatch threads */
+                ceph_async_iput(inode);
                 spin_lock(&mdsc->snap_flush_lock);
         }
         spin_unlock(&mdsc->snap_flush_lock);
@@ -950,12 +954,14 @@ void ceph_handle_snap(struct ceph_mds_client *mdsc,
                         ceph_get_snap_realm(mdsc, realm);
                         ceph_put_snap_realm(mdsc, oldrealm);
 
-                        iput(inode);
+                        /* avoid calling iput_final() while holding
+                         * mdsc->snap_rwsem or mds in dispatch threads */
+                        ceph_async_iput(inode);
                         continue;
 
 skip_inode:
                         spin_unlock(&ci->i_ceph_lock);
-                        iput(inode);
+                        ceph_async_iput(inode);
                 }
 
                 /* we may have taken some of the old realm's children. */