From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755313AbbCCAzh (ORCPT ); Mon, 2 Mar 2015 19:55:37 -0500 Received: from mail-qa0-f51.google.com ([209.85.216.51]:44118 "EHLO mail-qa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755249AbbCCAzg (ORCPT ); Mon, 2 Mar 2015 19:55:36 -0500 Date: Mon, 2 Mar 2015 19:55:32 -0500 From: Jeff Layton To: Daniel Wagner Cc: Jeff Layton , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, "J. Bruce Fields" , Alexander Viro Subject: Re: [RFC v2 1/4] locks: Remove unnecessary IS_POSIX test Message-ID: <20150302195532.4e604574@tlielax.poochiereds.net> In-Reply-To: <1425306313-7234-2-git-send-email-daniel.wagner@bmw-carit.de> References: <1425306313-7234-1-git-send-email-daniel.wagner@bmw-carit.de> <1425306313-7234-2-git-send-email-daniel.wagner@bmw-carit.de> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.26; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2 Mar 2015 15:25:10 +0100 Daniel Wagner wrote: > Since following change > > commit bd61e0a9c852de2d705b6f1bb2cc54c5774db570 > Author: Jeff Layton > 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 > Cc: Jeff Layton > Cc: "J. Bruce Fields" > Cc: Alexander Viro > --- > fs/locks.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/fs/locks.c b/fs/locks.c > index 365c82e..f63aa92 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) Merged for v4.1. Thanks! -- Jeff Layton