From: David Howells <dhowells@redhat.com>
Date: Thu, 29 Jan 2015 12:02:36 +0000 (+0000)
Subject: fanotify: Fix up scripted S_ISDIR/S_ISREG/S_ISLNK conversions
X-Git-Tag: Ubuntu-5.0.0-8.9~9852^2~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=54f2a2f42759b11ada761013a12f0e743702219a;p=mirror_ubuntu-disco-kernel.git

fanotify: Fix up scripted S_ISDIR/S_ISREG/S_ISLNK conversions

Fanotify probably doesn't want to watch autodirs so make it use d_can_lookup()
rather than d_is_dir() when checking a dir watch and give an error on fake
directories.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 61fdbb826324..9a66ff79ff27 100644
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -116,7 +116,7 @@ static bool fanotify_should_send_event(struct fsnotify_mark *inode_mark,
 
 	/* sorry, fanotify only gives a damn about files and dirs */
 	if (!d_is_reg(path->dentry) &&
-	    !d_is_dir(path->dentry))
+	    !d_can_lookup(path->dentry))
 		return false;
 
 	if (inode_mark && vfsmnt_mark) {