locks: comment cleanups and clarifications

[linux-2.6-block.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index cb424a4fed71a42d237b72d16de8318bbbeb0fbd..ddeab49fe2be741ea95ae9e53012049a6bb1b51d 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -496,13 +496,12 @@ static void __locks_delete_block(struct file_lock *waiter)
 
 /*
  */
-void locks_delete_block(struct file_lock *waiter)
+static void locks_delete_block(struct file_lock *waiter)
 {
        lock_flocks();
        __locks_delete_block(waiter);
        unlock_flocks();
 }
-EXPORT_SYMBOL(locks_delete_block);
 
 /* Insert waiter into blocker's block list.
  * We use a circular list so that processes can be easily woken up in
@@ -519,9 +518,10 @@ static void locks_insert_block(struct file_lock *blocker,
                list_add(&waiter->fl_link, &blocked_list);
 }
 
-/* Wake up processes blocked waiting for blocker.
- * If told to wait then schedule the processes until the block list
- * is empty, otherwise empty the block list ourselves.
+/*
+ * Wake up processes blocked waiting for blocker.
+ *
+ * Must be called with the file_lock_lock held!
  */
 static void locks_wake_up_blocks(struct file_lock *blocker)
 {
@@ -807,6 +807,11 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
        }
 
        lock_flocks();
+       /*
+        * New lock request. Walk all POSIX locks and look for conflicts. If
+        * there are any, either return error or put the request on the
+        * blocker's list of waiters and the global blocked_list.
+        */
        if (request->fl_type != F_UNLCK) {
                for_each_lock(inode, before) {
                        fl = *before;
@@ -845,7 +850,7 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
                before = &fl->fl_next;
        }
 
-       /* Process locks with this owner.  */
+       /* Process locks with this owner. */
        while ((fl = *before) && posix_same_owner(request, fl)) {
                /* Detect adjacent or overlapping regions (if same lock type)
                 */
@@ -931,10 +936,9 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
        }
 
        /*
-        * The above code only modifies existing locks in case of
-        * merging or replacing.  If new lock(s) need to be inserted
-        * all modifications are done bellow this, so it's safe yet to
-        * bail out.
+        * The above code only modifies existing locks in case of merging or
+        * replacing. If new lock(s) need to be inserted all modifications are
+        * done below this, so it's safe yet to bail out.
         */
        error = -ENOLCK; /* "no luck" */
        if (right && left == right && !new_fl2)
@@ -1338,7 +1342,7 @@ int fcntl_getlease(struct file *filp)
        return type;
 }
 
-int generic_add_lease(struct file *filp, long arg, struct file_lock **flp)
+static int generic_add_lease(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;
@@ -1403,7 +1407,7 @@ out:
        return error;
 }
 
-int generic_delete_lease(struct file *filp, struct file_lock **flp)
+static int generic_delete_lease(struct file *filp, struct file_lock **flp)
 {
        struct file_lock *fl, **before;
        struct dentry *dentry = filp->f_path.dentry;
@@ -2099,13 +2103,12 @@ void locks_remove_flock(struct file *filp)
 
 /**
  *     posix_unblock_lock - stop waiting for a file lock
- *      @filp:   how the file was opened
  *     @waiter: the lock which was waiting
  *
  *     lockd needs to block waiting for locks.
  */
 int
-posix_unblock_lock(struct file *filp, struct file_lock *waiter)
+posix_unblock_lock(struct file_lock *waiter)
 {
        int status = 0;
 
@@ -2117,7 +2120,6 @@ posix_unblock_lock(struct file *filp, struct file_lock *waiter)
        unlock_flocks();
        return status;
 }
-
 EXPORT_SYMBOL(posix_unblock_lock);
 
 /**