Merge with /home/shaggy/git/linus-clean/

1 files changed, 12 insertions, 18 deletions

diff --git a/fs/locks.c b/fs/locks.c
index a1e8b2248014..909eab8fb1d0 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -154,7 +154,7 @@ static struct file_lock *locks_alloc_lock(void)
 }
 
 /* Free a lock which is not in use. */
-static inline void locks_free_lock(struct file_lock *fl)
+static void locks_free_lock(struct file_lock *fl)
 {
         if (fl == NULL) {
                 BUG();
@@ -475,8 +475,7 @@ static inline int locks_overlap(struct file_lock *fl1, struct file_lock *fl2)
 /*
  * Check whether two locks have the same owner.
  */
-static inline int
-posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
+static int posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
 {
         if (fl1->fl_lmops && fl1->fl_lmops->fl_compare_owner)
                 return fl2->fl_lmops == fl1->fl_lmops &&
@@ -487,7 +486,7 @@ posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
 /* Remove waiter from blocker's block list.
  * When blocker ends up pointing to itself then the list is empty.
  */
-static inline void __locks_delete_block(struct file_lock *waiter)
+static void __locks_delete_block(struct file_lock *waiter)
 {
         list_del_init(&waiter->fl_block);
         list_del_init(&waiter->fl_link);
@@ -1105,7 +1104,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 +1428,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);
@@ -1959,22 +1957,18 @@ EXPORT_SYMBOL(posix_block_lock);
  *
  *      lockd needs to block waiting for locks.
  */
-void
+int
 posix_unblock_lock(struct file *filp, struct file_lock *waiter)
 {
-        /* 
-         * A remote machine may cancel the lock request after it's been
-         * granted locally.  If that happens, we need to delete the lock.
-         */
+        int status = 0;
+
         lock_kernel();
-        if (waiter->fl_next) {
+        if (waiter->fl_next)
                 __locks_delete_block(waiter);
-                unlock_kernel();
-        } else {
-                unlock_kernel();
-                waiter->fl_type = F_UNLCK;
-                posix_lock_file(filp, waiter);
-        }
+        else
+                status = -ENOENT;
+        unlock_kernel();
+        return status;
 }
 
 EXPORT_SYMBOL(posix_unblock_lock);