Merge remote-tracking branch 'linus/master' into testing

1 files changed, 6 insertions, 4 deletions

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 602f56db0442..d2bb7ed8fa74 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -449,10 +449,12 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
 
         spin_lock_irqsave(&sysfs_open_dirent_lock, flags);
 
-        od = sd->s_attr.open;
-        if (od) {
-                atomic_inc(&od->event);
-                wake_up_interruptible(&od->poll);
+        if (!WARN_ON(sysfs_type(sd) != SYSFS_KOBJ_ATTR)) {
+                od = sd->s_attr.open;
+                if (od) {
+                        atomic_inc(&od->event);
+                        wake_up_interruptible(&od->poll);
+                }
         }
 
         spin_unlock_irqrestore(&sysfs_open_dirent_lock, flags);