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

Commit 455434d4 authored by Al Viro's avatar Al Viro
Browse files

[PATCH] new helper - inotify_evict_watch() 



Kicks the watch out without dropping it.  Called under ->inotify_mutex

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b9efe8a2

fs/inotify.c

+8 −0
Original line number Diff line number Diff line
@@ -701,6 +701,14 @@ s32 inotify_clone_watch(struct inotify_watch *old, struct inotify_watch *new) 
	return ret;

}



void inotify_evict_watch(struct inotify_watch *watch)

{

	get_inotify_watch(watch);

	mutex_lock(&watch->ih->mutex);

	inotify_remove_watch_locked(watch->ih, watch);

	mutex_unlock(&watch->ih->mutex);

}



/**

 * inotify_rm_wd - remove a watch from an inotify instance

 * @ih: inotify handle

include/linux/inotify.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ extern __s32 inotify_find_update_watch(struct inotify_handle *, struct inode *, 
extern __s32 inotify_add_watch(struct inotify_handle *, struct inotify_watch *,

			       struct inode *, __u32);

extern __s32 inotify_clone_watch(struct inotify_watch *, struct inotify_watch *);

extern void inotify_evict_watch(struct inotify_watch *);

extern int inotify_rm_watch(struct inotify_handle *, struct inotify_watch *);

extern int inotify_rm_wd(struct inotify_handle *, __u32);

extern void inotify_remove_watch_locked(struct inotify_handle *,