Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jan Kara <jack@suse.cz>
To: Amir Goldstein <amir73il@gmail.com>
Cc: Jan Kara <jack@suse.cz>, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 2/9] inotify: do not set FS_EVENT_ON_CHILD in non-dir mark mask
Date: Mon, 27 Jul 2020 17:33:34 +0200	[thread overview]
Message-ID: <20200727153334.GE5284@quack2.suse.cz> (raw)
In-Reply-To: <20200722125849.17418-3-amir73il@gmail.com>

On Wed 22-07-20 15:58:42, Amir Goldstein wrote:
> Since commit ecf13b5f8fd6 ("fsnotify: send event with parent/name info
> to sb/mount/non-dir marks") the flag FS_EVENT_ON_CHILD has a meaning in
> mask of a mark on a non-dir inode.  It means that group is interested
> in the name of the file with events.
> 
> Since inotify is only intereseted in names of children of a watching
> parent, do not sete FS_EVENT_ON_CHILD flag for marks on non-dir.
> 
> Signed-off-by: Amir Goldstein <amir73il@gmail.com>

I've placed this commit in the series before "fsnotify: send event with
parent/name info to sb/mount/non-dir marks" and updated changelog
accordingly.

								Honza

> ---
>  fs/notify/inotify/inotify_user.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
> index 5385d5817dd9..186722ba3894 100644
> --- a/fs/notify/inotify/inotify_user.c
> +++ b/fs/notify/inotify/inotify_user.c
> @@ -75,15 +75,17 @@ struct ctl_table inotify_table[] = {
>  };
>  #endif /* CONFIG_SYSCTL */
>  
> -static inline __u32 inotify_arg_to_mask(u32 arg)
> +static inline __u32 inotify_arg_to_mask(struct inode *inode, u32 arg)
>  {
>  	__u32 mask;
>  
>  	/*
> -	 * everything should accept their own ignored, cares about children,
> -	 * and should receive events when the inode is unmounted
> +	 * Everything should accept their own ignored and should receive events
> +	 * when the inode is unmounted.  All directories care about children.
>  	 */
> -	mask = (FS_IN_IGNORED | FS_EVENT_ON_CHILD | FS_UNMOUNT);
> +	mask = (FS_IN_IGNORED | FS_UNMOUNT);
> +	if (S_ISDIR(inode->i_mode))
> +		mask |= FS_EVENT_ON_CHILD;
>  
>  	/* mask off the flags used to open the fd */
>  	mask |= (arg & (IN_ALL_EVENTS | IN_ONESHOT | IN_EXCL_UNLINK));
> @@ -512,7 +514,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group,
>  	int create = (arg & IN_MASK_CREATE);
>  	int ret;
>  
> -	mask = inotify_arg_to_mask(arg);
> +	mask = inotify_arg_to_mask(inode, arg);
>  
>  	fsn_mark = fsnotify_find_mark(&inode->i_fsnotify_marks, group);
>  	if (!fsn_mark)
> @@ -565,7 +567,7 @@ static int inotify_new_watch(struct fsnotify_group *group,
>  	struct idr *idr = &group->inotify_data.idr;
>  	spinlock_t *idr_lock = &group->inotify_data.idr_lock;
>  
> -	mask = inotify_arg_to_mask(arg);
> +	mask = inotify_arg_to_mask(inode, arg);
>  
>  	tmp_i_mark = kmem_cache_alloc(inotify_inode_mark_cachep, GFP_KERNEL);
>  	if (unlikely(!tmp_i_mark))
> -- 
> 2.17.1
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

  reply	other threads:[~2020-07-27 15:33 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-22 12:58 [PATCH 0/9] Fixes for fanotify name events Amir Goldstein
2020-07-22 12:58 ` [PATCH 1/9] fanotify: fix reporting event to sb/mount marks Amir Goldstein
2020-07-27 15:17   ` Jan Kara
2020-07-22 12:58 ` [PATCH 2/9] inotify: do not set FS_EVENT_ON_CHILD in non-dir mark mask Amir Goldstein
2020-07-27 15:33   ` Jan Kara [this message]
2020-07-22 12:58 ` [PATCH 3/9] audit: do not set FS_EVENT_ON_CHILD in audit marks mask Amir Goldstein
2020-07-27 15:33   ` Jan Kara
2020-07-22 12:58 ` [PATCH 4/9] fsnotify: create helper fsnotify_inode() Amir Goldstein
2020-07-27 16:26   ` Jan Kara
2020-07-22 12:58 ` [PATCH 5/9] fsnotify: simplify dir argument to handle_event() Amir Goldstein
2020-07-27 19:32   ` Jan Kara
2020-07-22 12:58 ` [PATCH 6/9] fsnotify: pass dir and inode arguments to fsnotify() Amir Goldstein
2020-07-27 21:26   ` Jan Kara
2020-07-22 12:58 ` [PATCH 7/9] fsnotify: fix merge with parent mark masks Amir Goldstein
2020-07-27 21:27   ` Jan Kara
2020-07-22 12:58 ` [PATCH 8/9] fsnotify: create method handle_inode_event() in fsnotify_operations Amir Goldstein
2020-07-27 21:27   ` Jan Kara
2020-07-22 12:58 ` [PATCH 9/9] fsnotify: pass inode to fsnotify_parent() Amir Goldstein
2020-07-27 21:29   ` Jan Kara
2020-07-27 21:57 ` [PATCH 0/9] Fixes for fanotify name events Jan Kara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200727153334.GE5284@quack2.suse.cz \
    --to=jack@suse.cz \
    --cc=amir73il@gmail.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --subject='Re: [PATCH 2/9] inotify: do not set FS_EVENT_ON_CHILD in non-dir mark mask' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).