Commit 9cd29044 authored Apr 03, 2015 by Daniel Wagner Committed by Jeff Layton Apr 03, 2015

locks: Remove unnecessary IS_POSIX test



Since following change

commit bd61e0a9
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>

parent 8f778bbc

fs/locks.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)

Admin message