fsnotify: allow marks to not pin inodes in core

inotify marks must pin inodes in core.  dnotify doesn't technically need to
since they are closed when the directory is closed.  fanotify also need to
pin inodes in core as it works today.  But the next step is to introduce
the concept of 'ignored masks' which is actually a mask of events for an
inode of no interest.  I claim that these should be liberally sent to the
kernel and should not pin the inode in core.  If the inode is brought back
in the listener will get an event it may have thought excluded, but this is
not a serious situation and one any listener should deal with.

This patch lays the ground work for non-pinning inode marks by using lazy
inode pinning.  We do not pin a mark until it has a non-zero mask entry.  If a
listener new sets a mask we never pin the inode.

Signed-off-by: Eric Paris <eparis@redhat.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index a12315a7553d..19d274057bfa 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -575,13 +575,11 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
         spin_lock(&fsn_mark->lock);
 
         old_mask = fsn_mark->mask;
-        if (add) {
-                fsn_mark->mask |= mask;
-                new_mask = fsn_mark->mask;
-        } else {
-                fsn_mark->mask = mask;
-                new_mask = fsn_mark->mask;
-        }
+        if (add)
+                fsnotify_set_mark_mask_locked(fsn_mark, (fsn_mark->mask | mask));
+        else
+                fsnotify_set_mark_mask_locked(fsn_mark, mask);
+        new_mask = fsn_mark->mask;
 
         spin_unlock(&fsn_mark->lock);