diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-05-10 19:02:07 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-10-09 18:32:45 -0400 |
| commit | b842e240f27678aa5d71611cddc8d17a93fb0caf (patch) | |
| tree | 7722a03d55068e783d0dfe6d98635ab50d2b5bfa /fs | |
| parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) | |
| download | linux-3.10-b842e240f27678aa5d71611cddc8d17a93fb0caf.tar.gz linux-3.10-b842e240f27678aa5d71611cddc8d17a93fb0caf.tar.bz2 linux-3.10-b842e240f27678aa5d71611cddc8d17a93fb0caf.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index c795eaaf6c4..51bae6227c2 100644 --- 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) |