summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDaniel Wagner <daniel.wagner@bmw-carit.de>2015-04-03 09:04:02 -0400
committerJeff Layton <jeff.layton@primarydata.com>2015-04-03 09:04:02 -0400
commit9cd29044bd7be430f0d38620a6b0b6a0c017c6c9 (patch)
tree1b4875f8e5577f26e3c4be2bd651d65757806e06 /fs
parent8f778bbc542ddf8f6243b21d6aca087e709cabdc (diff)
downloadblackbird-op-linux-9cd29044bd7be430f0d38620a6b0b6a0c017c6c9.tar.gz
blackbird-op-linux-9cd29044bd7be430f0d38620a6b0b6a0c017c6c9.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/locks.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/locks.c b/fs/locks.c
index 40bc384728c0..4517b8bfca11 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)
OpenPOWER on IntegriCloud