aboutsummaryrefslogtreecommitdiffstats
path: root/fs/notify/inotify
diff options
context:
space:
mode:
Diffstat (limited to 'fs/notify/inotify')
-rw-r--r--fs/notify/inotify/inotify_user.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index a4cd227c4c76..bf7f6d776c31 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -606,16 +606,11 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
606 int dropped = (old_mask & ~new_mask); 606 int dropped = (old_mask & ~new_mask);
607 /* more bits in this fsn_mark than the inode's mask? */ 607 /* more bits in this fsn_mark than the inode's mask? */
608 int do_inode = (new_mask & ~inode->i_fsnotify_mask); 608 int do_inode = (new_mask & ~inode->i_fsnotify_mask);
609 /* more bits in this fsn_mark than the group? */
610 int do_group = (new_mask & ~group->mask);
611 609
612 /* update the inode with this new fsn_mark */ 610 /* update the inode with this new fsn_mark */
613 if (dropped || do_inode) 611 if (dropped || do_inode)
614 fsnotify_recalc_inode_mask(inode); 612 fsnotify_recalc_inode_mask(inode);
615 613
616 /* update the group mask with the new mask */
617 if (dropped || do_group)
618 fsnotify_recalc_group_mask(group);
619 } 614 }
620 615
621 /* return the wd */ 616 /* return the wd */
@@ -673,10 +668,6 @@ static int inotify_new_watch(struct fsnotify_group *group,
673 /* return the watch descriptor for this new mark */ 668 /* return the watch descriptor for this new mark */
674 ret = tmp_i_mark->wd; 669 ret = tmp_i_mark->wd;
675 670
676 /* if this mark added a new event update the group mask */
677 if (mask & ~group->mask)
678 fsnotify_recalc_group_mask(group);
679
680out_err: 671out_err:
681 /* match the ref from fsnotify_init_mark() */ 672 /* match the ref from fsnotify_init_mark() */
682 fsnotify_put_mark(&tmp_i_mark->fsn_mark); 673 fsnotify_put_mark(&tmp_i_mark->fsn_mark);