diff --git a/[refs] b/[refs] index f7784addc944..59cfcece5feb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b9d1f19a7d6f13a97ac3eea9a1caea011ebd0ae +refs/heads/master: 41866a56cc4e676240b94ed8eaeca375aaef7496 diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c index a1e8b2248014..250ef53d25ef 100644 --- a/trunk/fs/locks.c +++ b/trunk/fs/locks.c @@ -1105,7 +1105,6 @@ static void time_out_leases(struct inode *inode) before = &fl->fl_next; continue; } - printk(KERN_INFO "lease broken - owner pid = %d\n", fl->fl_pid); lease_modify(before, fl->fl_type & ~F_INPROGRESS); if (fl == *before) /* lease_modify may have freed fl */ before = &fl->fl_next; @@ -1430,7 +1429,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);