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

Commit 3dbc6fb6 authored by Eric Paris's avatar Eric Paris
Browse files

inotify: clean up the inotify_add_watch out path 



inotify_add_watch explictly frees the unused inode mark, but it can just
use the generic code.  Just do that.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent e7b702b1

fs/notify/inotify/inotify_user.c

+2 −5
Original line number Diff line number Diff line
@@ -578,16 +578,13 @@ static int inotify_new_watch(struct fsnotify_group *group, 
	/* return the watch descriptor for this new entry */

	ret = tmp_ientry->wd;



	/* match the ref from fsnotify_init_markentry() */

	fsnotify_put_mark(&tmp_ientry->fsn_entry);



	/* if this mark added a new event update the group mask */

	if (mask & ~group->mask)

		fsnotify_recalc_group_mask(group);



out_err:

	if (ret < 0)

		kmem_cache_free(inotify_inode_mark_cachep, tmp_ientry);

	/* match the ref from fsnotify_init_markentry() */

	fsnotify_put_mark(&tmp_ientry->fsn_entry);



	return ret;

}