Binfmt_flat: Add minimum support for the Blackfin relocations

[pandora-kernel.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index 4c73b85..c795eaa 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -659,7 +659,7 @@ static int locks_block_on_timeout(struct file_lock *blocker, struct file_lock *w
        return result;
 }
 
-int
+void
 posix_test_lock(struct file *filp, struct file_lock *fl)
 {
        struct file_lock *cfl;
@@ -671,14 +671,12 @@ posix_test_lock(struct file *filp, struct file_lock *fl)
                if (posix_locks_conflict(cfl, fl))
                        break;
        }
-       if (cfl) {
+       if (cfl)
                __locks_copy_lock(fl, cfl);
-               unlock_kernel();
-               return 1;
-       } else
+       else
                fl->fl_type = F_UNLCK;
        unlock_kernel();
-       return 0;
+       return;
 }
 
 EXPORT_SYMBOL(posix_test_lock);
@@ -784,7 +782,7 @@ find_conflict:
        if (request->fl_flags & FL_ACCESS)
                goto out;
        locks_copy_lock(new_fl, request);
-       locks_insert_lock(&inode->i_flock, new_fl);
+       locks_insert_lock(before, new_fl);
        new_fl = NULL;
        error = 0;
 
@@ -1326,7 +1324,7 @@ int fcntl_getlease(struct file *filp)
 }
 
 /**
- *     setlease        -       sets a lease on an open file
+ *     generic_setlease        -       sets a lease on an open file
  *     @filp: file pointer
  *     @arg: type of lease to obtain
  *     @flp: input - file_lock to use, output - file_lock inserted
@@ -1336,7 +1334,7 @@ int fcntl_getlease(struct file *filp)
  *
  *     Called with kernel lock held.
  */
-int setlease(struct file *filp, long arg, struct file_lock **flp)
+int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
 {
        struct file_lock *fl, **before, **my_before = NULL, *lease;
        struct dentry *dentry = filp->f_path.dentry;
@@ -1421,7 +1419,7 @@ int setlease(struct file *filp, long arg, struct file_lock **flp)
 out:
        return error;
 }
-EXPORT_SYMBOL(setlease);
+EXPORT_SYMBOL(generic_setlease);
 
  /**
  *     vfs_setlease        -       sets a lease on an open file
@@ -1458,7 +1456,7 @@ int vfs_setlease(struct file *filp, long arg, struct file_lock **lease)
        if (filp->f_op && filp->f_op->setlease)
                error = filp->f_op->setlease(filp, arg, lease);
        else
-               error = setlease(filp, arg, lease);
+               error = generic_setlease(filp, arg, lease);
        unlock_kernel();
 
        return error;
@@ -1602,8 +1600,7 @@ asmlinkage long sys_flock(unsigned int fd, unsigned int cmd)
 /**
  * vfs_test_lock - test file byte range lock
  * @filp: The file to test lock for
- * @fl: The lock to test
- * @conf: Place to return a copy of the conflicting lock, if found
+ * @fl: The lock to test; also used to hold result
  *
  * Returns -ERRNO on failure.  Indicates presence of conflicting lock by
  * setting conf->fl_type to something other than F_UNLCK.
@@ -2279,7 +2276,7 @@ static int __init filelock_init(void)
 {
        filelock_cache = kmem_cache_create("file_lock_cache",
                        sizeof(struct file_lock), 0, SLAB_PANIC,
-                       init_once, NULL);
+                       init_once);
        return 0;
 }