From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752842AbbCUBBM (ORCPT <rfc822;w@1wt.eu>);
	Fri, 20 Mar 2015 21:01:12 -0400
Received: from mout.gmx.net ([212.227.17.22]:63394 "EHLO mout.gmx.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752710AbbCUBBK (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 20 Mar 2015 21:01:10 -0400
Message-ID: <550CC2D1.9070305@gmx.de>
Date: Sat, 21 Mar 2015 02:01:05 +0100
From: Lino Sanfilippo <LinoSanfilippo@gmx.de>
User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
MIME-Version: 1.0
To: Andrew Morton <akpm@linux-foundation.org>,
        Fabian Frederick <fabf@skynet.be>
CC: linux-kernel@vger.kernel.org, Jan Kara <jack@suse.cz>,
        David Howells <dhowells@redhat.com>, Eric Paris <eparis@redhat.com>
Subject: Re: [PATCH 1/1 linux-next] fanotify: fix a lock in fanotify_should_send_event()
References: <1426884968-1747-1-git-send-email-fabf@skynet.be> <20150320140943.9cca246285c4fa21b7621872@linux-foundation.org>
In-Reply-To: <20150320140943.9cca246285c4fa21b7621872@linux-foundation.org>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
X-Provags-ID: V03:K0:xEahtvwK1iYSXfaXhgCmUJ3EGbbUDrJhUIjJPBKtmATRuOaVRWx
 NSbfk8WzngviqZxWCqhSSDj+o4aNsMnocYACYZtPaiVCxqQTfHOAKAEHyomjVocIBYZM6pb
 EDlEn9YAH7OnuyqNTNL6BA2QkQSXAqcEUFg3a8ndX5yFnfl6zra32Fm1p9z0d0vj6xFJaLD
 hOcfGiEULbUhQo1jvAXVA==
X-UI-Out-Filterresults: notjunk:1;
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 20.03.2015 22:09, Andrew Morton wrote:
> On Fri, 20 Mar 2015 21:56:08 +0100 Fabian Frederick <fabf@skynet.be> wrote:
> 
>> ltp/fanotify02 was locked since commit 66ba93c0d7fe
>> ("fanotify: don't set FAN_ONDIR implicitly on a marks ignored mask")
> 
> What does "ltp/fanotify02 was locked" mean?  That this particular test
> failed to exit, or...?
> 
>> --- a/fs/notify/fanotify/fanotify.c
>> +++ b/fs/notify/fanotify/fanotify.c
>> @@ -140,8 +140,8 @@ static bool fanotify_should_send_event(struct fsnotify_mark *inode_mark,
>>  	}
>>  
>>  	if (d_is_dir(path->dentry) &&
>> -	    !(marks_mask & FS_ISDIR & ~marks_ignored_mask))
>> -		return false;
>> +	    (marks_mask & FS_ISDIR & ~marks_ignored_mask))
>> +		return true;
> 
> Should that be (marks_mask & FS_ISDIR & marks_ignored_mask)?
> 

No, the current logic should be correct, since we want events for
directories if we have FS_ISDIR set in the marks mask but not in its
ignored_mask.

Regards,
Lino