1 files changed, 23 insertions, 10 deletions

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 53726da5c010..8247bd1634cb 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -758,22 +758,35 @@ static int
 pnfs_layout_bulk_destroy_byserver_locked(struct nfs_client *clp,
                 struct nfs_server *server,
                 struct list_head *layout_list)
+        __must_hold(&clp->cl_lock)
+        __must_hold(RCU)
 {
         struct pnfs_layout_hdr *lo, *next;
         struct inode *inode;
 
         list_for_each_entry_safe(lo, next, &server->layouts, plh_layouts) {
-                if (test_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags))
+                if (test_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags) ||
+                    test_bit(NFS_LAYOUT_INODE_FREEING, &lo->plh_flags) ||
+                    !list_empty(&lo->plh_bulk_destroy))
                         continue;
+                /* If the sb is being destroyed, just bail */
+                if (!nfs_sb_active(server->super))
+                        break;
                 inode = igrab(lo->plh_inode);
-                if (inode == NULL)
-                        continue;
-                list_del_init(&lo->plh_layouts);
-                if (pnfs_layout_add_bulk_destroy_list(inode, layout_list))
-                        continue;
-                rcu_read_unlock();
-                spin_unlock(&clp->cl_lock);
-                iput(inode);
+                if (inode != NULL) {
+                        list_del_init(&lo->plh_layouts);
+                        if (pnfs_layout_add_bulk_destroy_list(inode,
+                                                layout_list))
+                                continue;
+                        rcu_read_unlock();
+                        spin_unlock(&clp->cl_lock);
+                        iput(inode);
+                } else {
+                        rcu_read_unlock();
+                        spin_unlock(&clp->cl_lock);
+                        set_bit(NFS_LAYOUT_INODE_FREEING, &lo->plh_flags);
+                }
+                nfs_sb_deactive(server->super);
                 spin_lock(&clp->cl_lock);
                 rcu_read_lock();
                 return -EAGAIN;
@@ -811,7 +824,7 @@ pnfs_layout_free_bulk_destroy_list(struct list_head *layout_list,
                 /* Free all lsegs that are attached to commit buckets */
                 nfs_commit_inode(inode, 0);
                 pnfs_put_layout_hdr(lo);
-                iput(inode);
+                nfs_iput_and_deactive(inode);
         }
         return ret;
 }