diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-19 10:37:42 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-19 10:37:42 +1100 |
| commit | 6d1925b875e552680d045baeb30fd25649dc15b2 (patch) | |
| tree | 0d8a7720d0afafde7111d6aea7a491408a94d227 /fs/nfsd | |
| parent | 259129c9451d6d17317cf7c7b2ac655033744823 (diff) | |
| parent | e227cdae4c5ddb2326e34358f3f66a78859eab6d (diff) | |
| download | linux-next-6d1925b875e552680d045baeb30fd25649dc15b2.tar.gz | |
Merge remote-tracking branch 'file-locks/locks-next'
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index d24f4144ed14..c9e2f0fa4e50 100644 --- 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); } } @@ -4866,7 +4866,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: |