1 files changed, 7 insertions, 4 deletions

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 0b32f9483b7a..300d17d85c0e 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -921,6 +921,7 @@ static struct nfs4_lock_state *nfs4_get_lock_state(struct nfs4_state *state, fl_
  */
 void nfs4_put_lock_state(struct nfs4_lock_state *lsp)
 {
+        struct nfs_server *server;
         struct nfs4_state *state;
 
         if (lsp == NULL)
@@ -932,11 +933,13 @@ void nfs4_put_lock_state(struct nfs4_lock_state *lsp)
         if (list_empty(&state->lock_states))
                 clear_bit(LK_STATE_IN_USE, &state->flags);
         spin_unlock(&state->state_lock);
+        server = state->owner->so_server;
         if (test_bit(NFS_LOCK_INITIALIZED, &lsp->ls_flags)) {
-                if (nfs4_release_lockowner(lsp) == 0)
-                        return;
-        }
-        nfs4_free_lock_state(lsp->ls_state->owner->so_server, lsp);
+                struct nfs_client *clp = server->nfs_client;
+
+                clp->cl_mvops->free_lock_state(server, lsp);
+        } else
+                nfs4_free_lock_state(server, lsp);
 }
 
 static void nfs4_fl_copy_lock(struct file_lock *dst, struct file_lock *src)