On Mon, 2 Mar 2015 15:25:10 +0100 Daniel Wagner <[email protected]> wrote:
> Since following change > > commit bd61e0a9c852de2d705b6f1bb2cc54c5774db570 > Author: Jeff Layton <[email protected]> > 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 <[email protected]> > Cc: Jeff Layton <[email protected]> > Cc: "J. Bruce Fields" <[email protected]> > Cc: Alexander Viro <[email protected]> > --- > 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 <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
