1 files changed, 13 insertions, 9 deletions

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 885363ca8569..2f6b447cdd82 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -229,6 +229,8 @@ static struct inode *nfs_delegation_grab_inode(struct nfs_delegation *delegation
         spin_lock(&delegation->lock);
         if (delegation->inode != NULL)
                 inode = igrab(delegation->inode);
+        if (!inode)
+                set_bit(NFS_DELEGATION_INODE_FREEING, &delegation->flags);
         spin_unlock(&delegation->lock);
         return inode;
 }
@@ -681,7 +683,7 @@ void nfs_expire_all_delegations(struct nfs_client *clp)
 
 /**
  * nfs_super_return_all_delegations - return delegations for one superblock
- * @sb: sb to process
+ * @server: pointer to nfs_server to process
  *
  */
 void nfs_server_return_all_delegations(struct nfs_server *server)
@@ -944,10 +946,11 @@ restart:
         list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link) {
                 list_for_each_entry_rcu(delegation, &server->delegations,
                                                                 super_list) {
-                        if (test_bit(NFS_DELEGATION_RETURNING,
-                                                &delegation->flags))
-                                continue;
-                        if (test_bit(NFS_DELEGATION_NEED_RECLAIM,
+                        if (test_bit(NFS_DELEGATION_INODE_FREEING,
+                                                &delegation->flags) ||
+                            test_bit(NFS_DELEGATION_RETURNING,
+                                                &delegation->flags) ||
+                            test_bit(NFS_DELEGATION_NEED_RECLAIM,
                                                 &delegation->flags) == 0)
                                 continue;
                         if (!nfs_sb_active(server->super))
@@ -1053,10 +1056,11 @@ restart:
         list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link) {
                 list_for_each_entry_rcu(delegation, &server->delegations,
                                                                 super_list) {
-                        if (test_bit(NFS_DELEGATION_RETURNING,
-                                                &delegation->flags))
-                                continue;
-                        if (test_bit(NFS_DELEGATION_TEST_EXPIRED,
+                        if (test_bit(NFS_DELEGATION_INODE_FREEING,
+                                                &delegation->flags) ||
+                            test_bit(NFS_DELEGATION_RETURNING,
+                                                &delegation->flags) ||
+                            test_bit(NFS_DELEGATION_TEST_EXPIRED,
                                                 &delegation->flags) == 0)
                                 continue;
                         if (!nfs_sb_active(server->super))