]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
locks: Remove unnecessary IS_POSIX test
authorDaniel Wagner <daniel.wagner@bmw-carit.de>
Fri, 3 Apr 2015 13:04:02 +0000 (09:04 -0400)
committerJeff Layton <jeff.layton@primarydata.com>
Fri, 3 Apr 2015 13:04:02 +0000 (09:04 -0400)
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>
fs/locks.c

index 40bc384728c0e07b637dccfa755fe49b5751bf86..4517b8bfca1189ddaddc6b9e2b79799a92b2d3c9 100644 (file)
@@ -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)