summaryrefslogtreecommitdiffstats
path: root/fs/locks.c
diff options
context:
space:
mode:
authorJeff Layton <jeff.layton@primarydata.com>2015-04-03 09:04:02 -0400
committerJeff Layton <jeff.layton@primarydata.com>2015-04-03 09:04:02 -0400
commit9b8c86956dea44276e2b2bb368f1f34895f4c5ea (patch)
tree6be539baf6853c6c8177a2480c7898e834f626af /fs/locks.c
parent9cd29044bd7be430f0d38620a6b0b6a0c017c6c9 (diff)
downloadlinux-stable-9b8c86956dea44276e2b2bb368f1f34895f4c5ea.tar.gz
linux-stable-9b8c86956dea44276e2b2bb368f1f34895f4c5ea.tar.bz2
linux-stable-9b8c86956dea44276e2b2bb368f1f34895f4c5ea.zip
locks: remove extraneous IS_POSIX and IS_FLOCK tests
We know that the locks being passed into this function are of the correct type, now that they live on their own lists. Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Diffstat (limited to 'fs/locks.c')
-rw-r--r--fs/locks.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/locks.c b/fs/locks.c
index 4517b8bfca11..f88ed4506664 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -730,7 +730,7 @@ static int posix_locks_conflict(struct file_lock *caller_fl, struct file_lock *s
/* POSIX locks owned by the same process do not conflict with
* each other.
*/
- if (!IS_POSIX(sys_fl) || posix_same_owner(caller_fl, sys_fl))
+ if (posix_same_owner(caller_fl, sys_fl))
return (0);
/* Check whether they overlap */
@@ -748,7 +748,7 @@ static int flock_locks_conflict(struct file_lock *caller_fl, struct file_lock *s
/* FLOCK locks referring to the same filp do not conflict with
* each other.
*/
- if (!IS_FLOCK(sys_fl) || (caller_fl->fl_file == sys_fl->fl_file))
+ if (caller_fl->fl_file == sys_fl->fl_file)
return (0);
if ((caller_fl->fl_type & LOCK_MAND) || (sys_fl->fl_type & LOCK_MAND))
return 0;