From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kara Subject: [PATCH 2/3] fsnotify: Fix check in inotify fdinfo printing Date: Wed, 15 Jul 2015 15:21:20 +0200 Message-ID: <1436966481-12517-3-git-send-email-jack@suse.com> References: <1436966481-12517-1-git-send-email-jack@suse.com> Cc: linux-fsdevel@vger.kernel.org, Jan Kara To: Andrew Morton Return-path: Received: from cantor2.suse.de ([195.135.220.15]:47890 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752562AbbGONVb (ORCPT ); Wed, 15 Jul 2015 09:21:31 -0400 In-Reply-To: <1436966481-12517-1-git-send-email-jack@suse.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Jan Kara A check in inotify_fdinfo() checking whether mark is valid was always true due to a bug. Luckily we can never get to invalidated marks since we hold mark_mutex and invalidated marks get removed from the group list when they are invalidated under that mutex. Anyway fix the check to make code more future proof. Signed-off-by: Jan Kara --- fs/notify/fdinfo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/notify/fdinfo.c b/fs/notify/fdinfo.c index 58b7cdb63da9..6b6f0d472ae8 100644 --- a/fs/notify/fdinfo.c +++ b/fs/notify/fdinfo.c @@ -76,7 +76,8 @@ static void inotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark) struct inotify_inode_mark *inode_mark; struct inode *inode; - if (!(mark->flags & (FSNOTIFY_MARK_FLAG_ALIVE | FSNOTIFY_MARK_FLAG_INODE))) + if (!(mark->flags & FSNOTIFY_MARK_FLAG_ALIVE) || + !(mark->flags & FSNOTIFY_MARK_FLAG_INODE)) return; inode_mark = container_of(mark, struct inotify_inode_mark, fsn_mark); -- 2.1.4