locks: reverse order of posix_locks_conflict() arguments

The first argument to posix_locks_conflict() is meant to be a lock request,
and the second a lock from an inode's lock request.  It doesn't really
make a difference which order you call them in, since the only
asymmetric test in posix_lock_conflict() is the check whether the second
argument is a posix lock--and every caller already does that check for
some reason.

But may as well fix posix_test_lock() to call posix_locks_conflict()
with the arguments in the same order as everywhere else.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>

diff --git a/fs/locks.c b/fs/locks.c
index c795eaaf6c4ceb75e5b4a0e9775df8c37ffb9240..51bae6227c25fe409df65ebd1157a608c2ae8075 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -668,7 +668,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl)
        for (cfl = filp->f_path.dentry->d_inode->i_flock; cfl; cfl = cfl->fl_next) {
                if (!IS_POSIX(cfl))
                        continue;
-               if (posix_locks_conflict(cfl, fl))
+               if (posix_locks_conflict(fl, cfl))
                        break;
        }
        if (cfl)