diff options
| author | Jan Kara <jack@suse.cz> | 2016-12-09 09:18:21 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2017-04-03 16:56:18 +0200 |
| commit | 5198adf649a0b7b0f9ddb98b264e57b41516116b (patch) | |
| tree | a7b1b404e7cd9de346338f3585ddb775d6186073 /fs/notify | |
| parent | 4495c08e84729385774601b5146d51d9e5849f81 (diff) | |
| download | linux-stable-5198adf649a0b7b0f9ddb98b264e57b41516116b.tar.gz linux-stable-5198adf649a0b7b0f9ddb98b264e57b41516116b.tar.bz2 linux-stable-5198adf649a0b7b0f9ddb98b264e57b41516116b.zip | |
fsnotify: Remove unnecessary tests when showing fdinfo
show_fdinfo() iterates group's list of marks. All marks found there are
guaranteed to be alive and they stay so until we release
group->mark_mutex. So remove uncecessary tests whether mark is alive.
Reviewed-by: Miklos Szeredi <mszeredi@redhat.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/notify')
| -rw-r--r-- | fs/notify/fdinfo.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/notify/fdinfo.c b/fs/notify/fdinfo.c index fd98e5100cab..601a59c8d87e 100644 --- a/fs/notify/fdinfo.c +++ b/fs/notify/fdinfo.c @@ -76,8 +76,7 @@ static void inotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark) struct inotify_inode_mark *inode_mark; struct inode *inode; - if (!(mark->flags & FSNOTIFY_MARK_FLAG_ALIVE) || - !(mark->flags & FSNOTIFY_MARK_FLAG_INODE)) + if (!(mark->flags & FSNOTIFY_MARK_FLAG_INODE)) return; inode_mark = container_of(mark, struct inotify_inode_mark, fsn_mark); @@ -113,9 +112,6 @@ static void fanotify_fdinfo(struct seq_file *m, struct fsnotify_mark *mark) unsigned int mflags = 0; struct inode *inode; - if (!(mark->flags & FSNOTIFY_MARK_FLAG_ALIVE)) - return; - if (mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY) mflags |= FAN_MARK_IGNORED_SURV_MODIFY; |