1 files changed, 5 insertions, 0 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ba86ec654c2e..fee2da856c95 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3275,6 +3275,11 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl,
 {
         struct nfs4_unlockdata *data;
 
+        /* Ensure this is an unlock - when canceling a lock, the
+         * canceled lock is passed in, and it won't be an unlock.
+         */
+        fl->fl_type = F_UNLCK;
+
         data = nfs4_alloc_unlockdata(fl, ctx, lsp, seqid);
         if (data == NULL) {
                 nfs_free_seqid(seqid);