Commit 9b8c8695 authored by Jeff Layton's avatar Jeff Layton

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: default avatarJeff Layton <>
parent 9cd29044
......@@ -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;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment