NLM: don't unlock on cancel requests

[mirror_ubuntu-artful-kernel.git] / fs / lockd / svclock.c

diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index e42f0cc6c45060bf66703e0fdbf589c984fe5aef..5fb48b4390bdba2107a03d294f60d1e2625ea924 100644 (file)
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -240,11 +240,6 @@ nlmsvc_delete_block(struct nlm_block *block, int unlock)
        nlmsvc_remove_block(block);
        if (fl->fl_next)
                posix_unblock_lock(file->f_file, fl);
-       if (unlock) {
-               fl->fl_type = F_UNLCK;
-               posix_lock_file(file->f_file, fl);
-               block->b_granted = 0;
-       }
 
        /* If the block is in the middle of a GRANT callback,
         * don't kill it yet. */