From: Jeff Layton Date: Fri, 3 Apr 2015 13:04:02 +0000 (-0400) Subject: locks: remove extraneous IS_POSIX and IS_FLOCK tests X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9b8c86956dea44276e2b2bb368f1f34895f4c5ea;p=deliverable%2Flinux.git 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 --- 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;