X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Flocks.c;h=250ef53d25ef8cfce06e333b83a746ef2577aa3d;hb=e7e37ee9c547213d726b29c2510cbb6696050405;hp=a1e8b2248014c0aa1d7ae8b2766440f753929908;hpb=974f7bc5781d3fc16e32d8908c6e48592e767dd2;p=linux-2.6-omap-h63xx.git

diff --git a/fs/locks.c b/fs/locks.c
index a1e8b224801..250ef53d25e 100644
--- a/fs/locks.c
+++ b/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);