diff options
Diffstat (limited to 'fs/notify/inotify')
| -rw-r--r-- | fs/notify/inotify/inotify_user.c | 12 |
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, | |||
| 575 | spin_lock(&fsn_mark->lock); | 575 | spin_lock(&fsn_mark->lock); |
| 576 | 576 | ||
| 577 | old_mask = fsn_mark->mask; | 577 | old_mask = fsn_mark->mask; |
| 578 | if (add) { | 578 | if (add) |
| 579 | fsn_mark->mask |= mask; | 579 | fsnotify_set_mark_mask_locked(fsn_mark, (fsn_mark->mask | mask)); |
| 580 | new_mask = fsn_mark->mask; | 580 | else |
| 581 | } else { | 581 | fsnotify_set_mark_mask_locked(fsn_mark, mask); |
| 582 | fsn_mark->mask = mask; | 582 | new_mask = fsn_mark->mask; |
| 583 | new_mask = fsn_mark->mask; | ||
| 584 | } | ||
| 585 | 583 | ||
| 586 | spin_unlock(&fsn_mark->lock); | 584 | spin_unlock(&fsn_mark->lock); |
| 587 | 585 | ||