Merge branches 'misc' and 'vdso' into for-next

[karo-tx-linux.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index 4753218f308ed32ee8b09123b11bc9cba42a6af4..528fedfda15e6432bd69b80c7bd8faceb7d1351d 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -681,21 +681,18 @@ static void locks_wake_up_blocks(struct file_lock *blocker)
 }
 
 static void
-locks_insert_lock_ctx(struct file_lock *fl, int *counter,
-                     struct list_head *before)
+locks_insert_lock_ctx(struct file_lock *fl, struct list_head *before)
 {
        fl->fl_nspid = get_pid(task_tgid(current));
        list_add_tail(&fl->fl_list, before);
-       ++*counter;
        locks_insert_global_locks(fl);
 }
 
 static void
-locks_unlink_lock_ctx(struct file_lock *fl, int *counter)
+locks_unlink_lock_ctx(struct file_lock *fl)
 {
        locks_delete_global_locks(fl);
        list_del_init(&fl->fl_list);
-       --*counter;
        if (fl->fl_nspid) {
                put_pid(fl->fl_nspid);
                fl->fl_nspid = NULL;
@@ -704,10 +701,9 @@ locks_unlink_lock_ctx(struct file_lock *fl, int *counter)
 }
 
 static void
-locks_delete_lock_ctx(struct file_lock *fl, int *counter,
-                     struct list_head *dispose)
+locks_delete_lock_ctx(struct file_lock *fl, struct list_head *dispose)
 {
-       locks_unlink_lock_ctx(fl, counter);
+       locks_unlink_lock_ctx(fl);
        if (dispose)
                list_add(&fl->fl_list, dispose);
        else
@@ -895,7 +891,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)
                if (request->fl_type == fl->fl_type)
                        goto out;
                found = true;
-               locks_delete_lock_ctx(fl, &ctx->flc_flock_cnt, &dispose);
+               locks_delete_lock_ctx(fl, &dispose);
                break;
        }
 
@@ -905,16 +901,6 @@ static int flock_lock_file(struct file *filp, struct file_lock *request)
                goto out;
        }
 
-       /*
-        * If a higher-priority process was blocked on the old file lock,
-        * give it the opportunity to lock the file.
-        */
-       if (found) {
-               spin_unlock(&ctx->flc_lock);
-               cond_resched();
-               spin_lock(&ctx->flc_lock);
-       }
-
 find_conflict:
        list_for_each_entry(fl, &ctx->flc_flock, fl_list) {
                if (!flock_locks_conflict(request, fl))
@@ -929,7 +915,7 @@ find_conflict:
        if (request->fl_flags & FL_ACCESS)
                goto out;
        locks_copy_lock(new_fl, request);
-       locks_insert_lock_ctx(new_fl, &ctx->flc_flock_cnt, &ctx->flc_flock);
+       locks_insert_lock_ctx(new_fl, &ctx->flc_flock);
        new_fl = NULL;
        error = 0;
 
@@ -1046,8 +1032,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
                        else
                                request->fl_end = fl->fl_end;
                        if (added) {
-                               locks_delete_lock_ctx(fl, &ctx->flc_posix_cnt,
-                                                       &dispose);
+                               locks_delete_lock_ctx(fl, &dispose);
                                continue;
                        }
                        request = fl;
@@ -1076,8 +1061,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
                                 * one (This may happen several times).
                                 */
                                if (added) {
-                                       locks_delete_lock_ctx(fl,
-                                               &ctx->flc_posix_cnt, &dispose);
+                                       locks_delete_lock_ctx(fl, &dispose);
                                        continue;
                                }
                                /*
@@ -1093,10 +1077,8 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
                                locks_copy_lock(new_fl, request);
                                request = new_fl;
                                new_fl = NULL;
-                               locks_insert_lock_ctx(request,
-                                       &ctx->flc_posix_cnt, &fl->fl_list);
-                               locks_delete_lock_ctx(fl,
-                                       &ctx->flc_posix_cnt, &dispose);
+                               locks_insert_lock_ctx(request, &fl->fl_list);
+                               locks_delete_lock_ctx(fl, &dispose);
                                added = true;
                        }
                }
@@ -1124,8 +1106,8 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
                        goto out;
                }
                locks_copy_lock(new_fl, request);
-               locks_insert_lock_ctx(new_fl, &ctx->flc_posix_cnt,
-                                       &fl->fl_list);
+               locks_insert_lock_ctx(new_fl, &fl->fl_list);
+               fl = new_fl;
                new_fl = NULL;
        }
        if (right) {
@@ -1136,8 +1118,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
                        left = new_fl2;
                        new_fl2 = NULL;
                        locks_copy_lock(left, right);
-                       locks_insert_lock_ctx(left, &ctx->flc_posix_cnt,
-                                               &fl->fl_list);
+                       locks_insert_lock_ctx(left, &fl->fl_list);
                }
                right->fl_start = request->fl_end + 1;
                locks_wake_up_blocks(right);
@@ -1321,7 +1302,6 @@ static void lease_clear_pending(struct file_lock *fl, int arg)
 /* We already had a lease on this file; just change its type */
 int lease_modify(struct file_lock *fl, int arg, struct list_head *dispose)
 {
-       struct file_lock_context *flctx;
        int error = assign_type(fl, arg);
 
        if (error)
@@ -1331,7 +1311,6 @@ int lease_modify(struct file_lock *fl, int arg, struct list_head *dispose)
        if (arg == F_UNLCK) {
                struct file *filp = fl->fl_file;
 
-               flctx = file_inode(filp)->i_flctx;
                f_delown(filp);
                filp->f_owner.signum = 0;
                fasync_helper(0, fl->fl_file, 0, &fl->fl_fasync);
@@ -1339,7 +1318,7 @@ int lease_modify(struct file_lock *fl, int arg, struct list_head *dispose)
                        printk(KERN_ERR "locks_delete_lock: fasync == %p\n", fl->fl_fasync);
                        fl->fl_fasync = NULL;
                }
-               locks_delete_lock_ctx(fl, &flctx->flc_lease_cnt, dispose);
+               locks_delete_lock_ctx(fl, dispose);
        }
        return 0;
 }
@@ -1456,8 +1435,7 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
                        fl->fl_downgrade_time = break_time;
                }
                if (fl->fl_lmops->lm_break(fl))
-                       locks_delete_lock_ctx(fl, &ctx->flc_lease_cnt,
-                                               &dispose);
+                       locks_delete_lock_ctx(fl, &dispose);
        }
 
        if (list_empty(&ctx->flc_lease))
@@ -1687,7 +1665,8 @@ generic_add_lease(struct file *filp, long arg, struct file_lock **flp, void **pr
        }
 
        if (my_fl != NULL) {
-               error = lease->fl_lmops->lm_change(my_fl, arg, &dispose);
+               lease = my_fl;
+               error = lease->fl_lmops->lm_change(lease, arg, &dispose);
                if (error)
                        goto out;
                goto out_setup;
@@ -1697,7 +1676,7 @@ generic_add_lease(struct file *filp, long arg, struct file_lock **flp, void **pr
        if (!leases_enable)
                goto out;
 
-       locks_insert_lock_ctx(lease, &ctx->flc_lease_cnt, &ctx->flc_lease);
+       locks_insert_lock_ctx(lease, &ctx->flc_lease);
        /*
         * The check in break_lease() is lockless. It's possible for another
         * open to race in after we did the earlier check for a conflicting
@@ -1710,7 +1689,7 @@ generic_add_lease(struct file *filp, long arg, struct file_lock **flp, void **pr
        smp_mb();
        error = check_conflicting_open(dentry, arg, lease->fl_flags);
        if (error) {
-               locks_unlink_lock_ctx(lease, &ctx->flc_lease_cnt);
+               locks_unlink_lock_ctx(lease);
                goto out;
        }
 
@@ -1749,7 +1728,7 @@ static int generic_delete_lease(struct file *filp, void *owner)
                        break;
                }
        }
-       trace_generic_delete_lease(inode, fl);
+       trace_generic_delete_lease(inode, victim);
        if (victim)
                error = fl->fl_lmops->lm_change(victim, F_UNLCK, &dispose);
        spin_unlock(&ctx->flc_lock);
@@ -2448,7 +2427,8 @@ locks_remove_lease(struct file *filp)
 
        spin_lock(&ctx->flc_lock);
        list_for_each_entry_safe(fl, tmp, &ctx->flc_lease, fl_list)
-               lease_modify(fl, F_UNLCK, &dispose);
+               if (filp == fl->fl_file)
+                       lease_modify(fl, F_UNLCK, &dispose);
        spin_unlock(&ctx->flc_lock);
        locks_dispose_list(&dispose);
 }