Merge tag 'nfsd-4.21' of git://linux-nfs.org/~bfields/linux

[linux-2.6-block.git] / fs / nfsd / nfs4state.c

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 0434980aa5e615a492fd8da5874dc595d82460e1..fb3c9844c82ae2ea1b7e7709cc48a8da3ae307c1 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -238,7 +238,7 @@ find_blocked_lock(struct nfs4_lockowner *lo, struct knfsd_fh *fh,
        }
        spin_unlock(&nn->blocked_locks_lock);
        if (found)
-               posix_unblock_lock(&found->nbl_lock);
+               locks_delete_block(&found->nbl_lock);
        return found;
 }
 
@@ -293,7 +293,7 @@ remove_blocked_locks(struct nfs4_lockowner *lo)
                nbl = list_first_entry(&reaplist, struct nfsd4_blocked_lock,
                                        nbl_lru);
                list_del_init(&nbl->nbl_lru);
-               posix_unblock_lock(&nbl->nbl_lock);
+               locks_delete_block(&nbl->nbl_lock);
                free_blocked_lock(nbl);
        }
 }
@@ -4863,7 +4863,7 @@ nfs4_laundromat(struct nfsd_net *nn)
                nbl = list_first_entry(&reaplist,
                                        struct nfsd4_blocked_lock, nbl_lru);
                list_del_init(&nbl->nbl_lru);
-               posix_unblock_lock(&nbl->nbl_lock);
+               locks_delete_block(&nbl->nbl_lock);
                free_blocked_lock(nbl);
        }
 out: