Merge tag 'write-page-prefaulting' of git://git.kernel.org/pub/scm/linux/kernel/git...

[uclinux-h8/linux.git] / fs / notify / mark.c

diff --git a/fs/notify/mark.c b/fs/notify/mark.c
index 9007d6a..4853184 100644 (file)
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -127,7 +127,7 @@ static void __fsnotify_recalc_mask(struct fsnotify_mark_connector *conn)
                return;
        hlist_for_each_entry(mark, &conn->list, obj_list) {
                if (mark->flags & FSNOTIFY_MARK_FLAG_ATTACHED)
-                       new_mask |= mark->mask;
+                       new_mask |= fsnotify_calc_mask(mark);
        }
        *fsnotify_conn_mask_p(conn) = new_mask;
 }
@@ -692,7 +692,7 @@ int fsnotify_add_mark_locked(struct fsnotify_mark *mark,
        if (ret)
                goto err;
 
-       if (mark->mask)
+       if (mark->mask || mark->ignored_mask)
                fsnotify_recalc_mask(mark->connector);
 
        return ret;