aboutsummaryrefslogtreecommitdiffstats
path: root/fs/locks.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/locks.c')
-rw-r--r--fs/locks.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/locks.c b/fs/locks.c
index a1e8b2248014..250ef53d25ef 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1105,7 +1105,6 @@ static void time_out_leases(struct inode *inode)
1105 before = &fl->fl_next; 1105 before = &fl->fl_next;
1106 continue; 1106 continue;
1107 } 1107 }
1108 printk(KERN_INFO "lease broken - owner pid = %d\n", fl->fl_pid);
1109 lease_modify(before, fl->fl_type & ~F_INPROGRESS); 1108 lease_modify(before, fl->fl_type & ~F_INPROGRESS);
1110 if (fl == *before) /* lease_modify may have freed fl */ 1109 if (fl == *before) /* lease_modify may have freed fl */
1111 before = &fl->fl_next; 1110 before = &fl->fl_next;
@@ -1430,7 +1429,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg)
1430 lock_kernel(); 1429 lock_kernel();
1431 1430
1432 error = __setlease(filp, arg, &flp); 1431 error = __setlease(filp, arg, &flp);
1433 if (error) 1432 if (error || arg == F_UNLCK)
1434 goto out_unlock; 1433 goto out_unlock;
1435 1434
1436 error = fasync_helper(fd, filp, 1, &flp->fl_fasync); 1435 error = fasync_helper(fd, filp, 1, &flp->fl_fasync);