Since notification marks no longer hold inode references the name of flag FSNOTIFY_MARK_FLAG_NO_IREF doesn't make sense anymore. Rename it to FSNOTIFY_MARK_FLAG_EVICTABLE. Signed-off-by: Jan Kara --- fs/notify/fanotify/fanotify.h | 2 +- fs/notify/fanotify/fanotify_user.c | 8 ++++---- include/linux/fsnotify_backend.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/notify/fanotify/fanotify.h b/fs/notify/fanotify/fanotify.h index b78308975082..1521a5bf2b9e 100644 --- a/fs/notify/fanotify/fanotify.h +++ b/fs/notify/fanotify/fanotify.h @@ -538,7 +538,7 @@ static inline unsigned int fanotify_mark_user_flags(struct fsnotify_mark *mark) if (mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY) mflags |= FAN_MARK_IGNORED_SURV_MODIFY; - if (mark->flags & FSNOTIFY_MARK_FLAG_NO_IREF) + if (mark->flags & FSNOTIFY_MARK_FLAG_EVICTABLE) mflags |= FAN_MARK_EVICTABLE; if (mark->flags & FSNOTIFY_MARK_FLAG_HAS_IGNORE_FLAGS) mflags |= FAN_MARK_IGNORE; diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 2c440ea96521..c820fe9aee20 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -1213,9 +1213,9 @@ static bool fanotify_mark_update_flags(struct fsnotify_mark *fsn_mark, if (ignore == FAN_MARK_IGNORE) fsn_mark->flags |= FSNOTIFY_MARK_FLAG_HAS_IGNORE_FLAGS; - /* NO_IREF may be removed from a mark, but not added */ + /* EVICTABLE may be removed from a mark, but not added */ if (!(fan_flags & FAN_MARK_EVICTABLE)) - fsn_mark->flags &= ~FSNOTIFY_MARK_FLAG_NO_IREF; + fsn_mark->flags &= ~FSNOTIFY_MARK_FLAG_EVICTABLE; /* * Setting FAN_MARK_IGNORED_SURV_MODIFY for the first time may lead to @@ -1339,7 +1339,7 @@ static struct fsnotify_mark *fanotify_add_new_mark(struct fsnotify_group *group, mark = &fan_mark->fsn_mark; fsnotify_init_mark(mark, group); if (fan_flags & FAN_MARK_EVICTABLE) - mark->flags |= FSNOTIFY_MARK_FLAG_NO_IREF; + mark->flags |= FSNOTIFY_MARK_FLAG_EVICTABLE; /* Cache fsid of filesystem containing the marked object */ if (fsid) { @@ -1381,7 +1381,7 @@ static int fanotify_may_update_existing_mark(struct fsnotify_mark *fsn_mark, * Non evictable mark cannot be downgraded to evictable mark. */ if (fan_flags & FAN_MARK_EVICTABLE && - !(fsn_mark->flags & FSNOTIFY_MARK_FLAG_NO_IREF)) + !(fsn_mark->flags & FSNOTIFY_MARK_FLAG_EVICTABLE)) return -EEXIST; /* diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h index c7ca848f576c..4b7bd48dd9aa 100644 --- a/include/linux/fsnotify_backend.h +++ b/include/linux/fsnotify_backend.h @@ -628,7 +628,7 @@ struct fsnotify_mark { #define FSNOTIFY_MARK_FLAG_IN_ONESHOT 0x0020 /* fanotify mark flags */ #define FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY 0x0100 -#define FSNOTIFY_MARK_FLAG_NO_IREF 0x0200 +#define FSNOTIFY_MARK_FLAG_EVICTABLE 0x0200 #define FSNOTIFY_MARK_FLAG_HAS_IGNORE_FLAGS 0x0400 #define FSNOTIFY_MARK_FLAG_HAS_FSID 0x0800 #define FSNOTIFY_MARK_FLAG_WEAK_FSID 0x1000 -- 2.51.0