diff --git a/[refs] b/[refs] index 7c5a54411e36..97e831710bb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e6c67fd2716720d9029d38ea25884efcfdedeb6 +refs/heads/master: dc15ae14e97ee9d5ed740cbb0b94996076d8b37e diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c index a1e8b2248014..600d1fbe3571 100644 --- a/trunk/fs/locks.c +++ b/trunk/fs/locks.c @@ -1430,7 +1430,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg) lock_kernel(); error = __setlease(filp, arg, &flp); - if (error) + if (error || arg == F_UNLCK) goto out_unlock; error = fasync_helper(fd, filp, 1, &flp->fl_fasync);