From: Daniel Wagner <daniel.wagner@bmw-carit.de>
Date: Fri, 3 Apr 2015 13:04:02 +0000 (-0400)
Subject: locks: Remove unnecessary IS_POSIX test
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9cd29044bd7be430f0d38620a6b0b6a0c017c6c9;p=linux.git

locks: Remove unnecessary IS_POSIX test

Since following change

commit bd61e0a9c852de2d705b6f1bb2cc54c5774db570
Author: Jeff Layton <jlayton@primarydata.com>
Date:   Fri Jan 16 15:05:55 2015 -0500

    locks: convert posix locks to file_lock_context

all Posix locks are kept on their a separate list, so the test is
redudant.

Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: Jeff Layton <jlayton@primarydata.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
---

diff --git a/fs/locks.c b/fs/locks.c
index 40bc384728c0e..4517b8bfca118 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -964,8 +964,6 @@ static int __posix_lock_file(struct inode *inode, struct file_lock *request, str
 	 */
 	if (request->fl_type != F_UNLCK) {
 		list_for_each_entry(fl, &ctx->flc_posix, fl_list) {
-			if (!IS_POSIX(fl))
-				continue;
 			if (!posix_locks_conflict(request, fl))
 				continue;
 			if (conflock)