Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5198adf6 authored by Jan Kara's avatar Jan Kara
Browse files

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: default avatarMiklos Szeredi <mszeredi@redhat.com>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 4495c08e

fs/notify/fdinfo.c

+1 −5
Original line number Diff line number Diff line
@@ -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;