Andreas Gruenbacher 945526846a dnotify: ignore FS_EVENT_ON_CHILD ...

Mask off FS_EVENT_ON_CHILD in dnotify_handle_event().  Otherwise, when there
is more than one watch on a directory and dnotify_should_send_event()
succeeds, events with FS_EVENT_ON_CHILD set will trigger all watches and cause
spurious events.

This case was overlooked in commit e42e2773.

	#define _GNU_SOURCE

	#include <stdio.h>
	#include <stdlib.h>
	#include <unistd.h>
	#include <signal.h>
	#include <sys/types.h>
	#include <sys/stat.h>
	#include <fcntl.h>
	#include <string.h>

	static void create_event(int s, siginfo_t* si, void* p)
	{
		printf("create\n");
	}

	static void delete_event(int s, siginfo_t* si, void* p)
	{
		printf("delete\n");
	}

	int main (void) {
		struct sigaction action;
		char *tmpdir, *file;
		int fd1, fd2;

		sigemptyset (&action.sa_mask);
		action.sa_flags = SA_SIGINFO;

		action.sa_sigaction = create_event;
		sigaction (SIGRTMIN + 0, &action, NULL);

		action.sa_sigaction = delete_event;
		sigaction (SIGRTMIN + 1, &action, NULL);

	#	define TMPDIR "/tmp/test.XXXXXX"
		tmpdir = malloc(strlen(TMPDIR) + 1);
		strcpy(tmpdir, TMPDIR);
		mkdtemp(tmpdir);

	#	define TMPFILE "/file"
		file = malloc(strlen(tmpdir) + strlen(TMPFILE) + 1);
		sprintf(file, "%s/%s", tmpdir, TMPFILE);

		fd1 = open (tmpdir, O_RDONLY);
		fcntl(fd1, F_SETSIG, SIGRTMIN);
		fcntl(fd1, F_NOTIFY, DN_MULTISHOT | DN_CREATE);

		fd2 = open (tmpdir, O_RDONLY);
		fcntl(fd2, F_SETSIG, SIGRTMIN + 1);
		fcntl(fd2, F_NOTIFY, DN_MULTISHOT | DN_DELETE);

		if (fork()) {
			/* This triggers a create event */
			creat(file, 0600);
			/* This triggers a create and delete event (!) */
			unlink(file);
		} else {
			sleep(1);
			rmdir(tmpdir);
		}

		return 0;
	}

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Eric Paris <eparis@redhat.com>

2009-10-20 18:02:33 -04:00

..

9p

9p: Add fscache support to 9p

2009-09-23 13:03:46 -05:00

adfs

adfs: remove redundant test on unsigned

2009-09-24 07:21:05 -07:00

affs

affs: add ->sync_fs

2009-06-11 21:36:14 -04:00

afs

afs: remove cache.h

2009-10-01 16:11:16 -07:00

autofs

trivial: remove unnecessary semicolons

2009-09-21 15:14:58 +02:00

autofs4

autofs4 - fix missed case when changing to use struct path

2009-08-31 17:44:05 -10:00

befs

fs: Make unload_nls() NULL pointer safe

2009-09-24 07:47:42 -04:00

bfs

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

btrfs

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

2009-10-15 15:06:37 -07:00

cachefiles

enforce ->sync_fs is only called for rw superblock

2009-06-11 21:36:06 -04:00

cifs

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

2009-09-26 10:10:35 -07:00

coda

headers: remove sched.h from poll.h

2009-10-04 15:05:10 -07:00

configfs

writeback: add name to backing_dev_info

2009-09-11 09:20:26 +02:00

cramfs

fs/cramfs: return f_fsid for statfs(2)

2009-04-02 19:05:08 -07:00

debugfs

debugfs: use specified mode to possibly mark files read/write only

2009-06-15 21:30:28 -07:00

devpts

Move magic numbers into magic.h

2009-09-23 07:39:28 -07:00

dlm

dlm: fix socket fd translation

2009-09-30 12:19:44 -05:00

ecryptfs

ima: ecryptfs fix imbalance message

2009-10-08 11:31:38 -05:00

efs

get rid of BKL in fs/efs

2009-06-17 00:36:36 -04:00

exofs

exofs: remove BKL from super operations

2009-09-24 07:47:38 -04:00

exportfs

…

ext2

Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6

2009-09-24 07:53:22 -07:00

ext3

ext3: Don't update superblock write time when filesystem is read-only

2009-10-13 00:06:43 +02:00

ext4

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2009-10-03 11:24:19 -07:00

fat

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

2009-09-30 09:31:14 -07:00

freevxfs

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

fscache

FS-Cache: Fixup renamed filenames in comments in internal.h

2009-05-27 10:20:13 -07:00

fuse

const: mark struct vm_struct_operations

2009-09-27 11:39:25 -07:00

gfs2

const: mark struct vm_struct_operations

2009-09-27 11:39:25 -07:00

hfs

fs: Make unload_nls() NULL pointer safe

2009-09-24 07:47:42 -04:00

hfsplus

fs: Make unload_nls() NULL pointer safe

2009-09-24 07:47:42 -04:00

hostfs

hostfs: set maximum filesize in superblock for proper LFS support

2009-06-30 18:56:03 -07:00

hpfs

headers: smp_lock.h redux

2009-07-12 12:22:34 -07:00

hppfs

hppfs: hppfs_read_file() may return -ERROR

2009-04-02 19:04:53 -07:00

hugetlbfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

2009-09-24 08:32:11 -07:00

isofs

fs: Make unload_nls() NULL pointer safe

2009-09-24 07:47:42 -04:00

jbd

jbd: Annotate transaction start also for journal_restart()

2009-09-16 17:44:10 +02:00

jbd2

const: constify remaining file_operations

2009-10-01 16:11:11 -07:00

jffs2

Merge git://git.infradead.org/mtd-2.6

2009-09-23 10:07:49 -07:00

jfs

fs: Make unload_nls() NULL pointer safe

2009-09-24 07:47:42 -04:00

lockd

headers: utsname.h redux

2009-09-23 18:13:10 -07:00

minix

V3 minixfs: add missing directory type checking

2009-09-23 07:39:57 -07:00

ncpfs

const: mark struct vm_struct_operations

2009-09-27 11:39:25 -07:00

nfs

NFS: suppress a build warning

2009-10-12 10:25:12 -07:00

nfs_common

…

nfsd

const: constify remaining file_operations

2009-10-01 16:11:11 -07:00

nilfs2

const: constify remaining file_operations

2009-10-01 16:11:11 -07:00

nls

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6

2009-09-30 09:31:14 -07:00

notify

dnotify: ignore FS_EVENT_ON_CHILD

2009-10-20 18:02:33 -04:00

ntfs

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

2009-09-24 08:32:11 -07:00

ocfs2

const: constify remaining file_operations

2009-10-01 16:11:11 -07:00

omfs

const: constify remaining file_operations

2009-10-01 16:11:11 -07:00

openpromfs

…

partitions

block: Seperate read and write statistics of in_flight requests v2

2009-10-06 20:16:55 +02:00

proc

pagemap: export KPF_HWPOISON

2009-10-08 07:36:39 -07:00

qnx4

qnx4: remove write support

2009-09-23 07:39:30 -07:00

quota

const: make struct super_block::s_qcop const

2009-09-22 07:17:24 -07:00

ramfs

truncate: use new helpers

2009-09-24 08:41:47 -04:00

reiserfs

const: make struct super_block::s_qcop const

2009-09-22 07:17:24 -07:00

romfs

ROMFS: fix length used with romfs_dev_strnlen() function

2009-10-11 11:33:56 -07:00

smbfs

fs: Make unload_nls() NULL pointer safe

2009-09-24 07:47:42 -04:00

squashfs

const: mark remaining super_operations const

2009-09-22 07:17:24 -07:00

sysfs

sysfs: Allow sysfs_notify_dirent to be called from interrupt context.

2009-10-14 15:16:25 -07:00

sysv

get rid of BKL in fs/sysv

2009-06-17 00:36:37 -04:00

ubifs

const: mark struct vm_struct_operations

2009-09-27 11:39:25 -07:00

udf

udf: Fix possible corruption when close races with write

2009-09-14 19:13:01 +02:00

ufs

ufs: sector_t cannot be negative

2009-06-18 13:03:46 -07:00

xfs

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

2009-10-09 13:29:42 -07:00

aio.c

aio.c: move EXPORT* macros to line after function

2009-09-23 07:39:29 -07:00

anon_inodes.c

headers: remove sched.h from poll.h

2009-10-04 15:05:10 -07:00

attr.c

truncate: new helpers

2009-09-24 08:41:47 -04:00

bad_inode.c

…

binfmt_aout.c

…

binfmt_elf_fdpic.c

fdpic: ignore the loader's PT_GNU_STACK when calculating the stack size

2009-09-24 07:21:02 -07:00

binfmt_elf.c

elf: clean up fill_note_info()

2009-09-24 07:21:01 -07:00

binfmt_em86.c

…

binfmt_flat.c

flat: use IS_ERR_VALUE() helper macro

2009-09-24 07:21:03 -07:00

binfmt_misc.c

…

binfmt_script.c

…

binfmt_som.c

Don't crap into descriptor table in binfmt_som

2009-03-31 23:00:28 -04:00

bio-integrity.c

block: Create bip slabs with embedded integrity vectors

2009-07-01 10:56:25 +02:00

bio.c

fs/bio.c: move EXPORT* macros to line after function

2009-10-01 21:15:46 +02:00

block_dev.c

freeze_bdev: grab active reference to frozen superblocks

2009-09-24 07:47:41 -04:00

buffer.c

Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block

2009-09-25 09:27:30 -07:00

char_dev.c

fs/char_dev.c: remove useless loop

2009-09-24 07:21:03 -07:00

compat_binfmt_elf.c

…

compat_ioctl.c

compat_ioctl: hook up compat handler for FIEMAP ioctl

2009-08-07 10:39:56 -07:00

compat.c

fs: fix overflow in sys_mount() for in-kernel calls

2009-09-24 08:40:15 -04:00

dcache.c

sched: Pull up the might_sleep() check into cond_resched()

2009-07-18 15:51:44 +02:00

dcookies.c

…

direct-io.c

block: Do away with the notion of hardsect_size

2009-05-22 23:22:54 +02:00

drop_caches.c

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

eventfd.c

anonfd: split interface into file creation and install

2009-09-23 07:39:29 -07:00

eventpoll.c

epoll: fix nested calls support

2009-06-18 13:03:41 -07:00

exec.c

task_struct cleanup: move binfmt field to mm_struct

2009-09-24 07:21:05 -07:00

fcntl.c

fcntl: add F_[SG]ETOWN_EX

2009-09-24 07:21:01 -07:00

fifo.c

…

file_table.c

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

file.c

headers: remove sched.h from interrupt.h

2009-10-11 11:20:58 -07:00

filesystems.c

fs: Mark get_filesystem_list() as __init function.

2009-04-20 23:02:52 -04:00

fs_struct.c

Get rid of indirect include of fs_struct.h

2009-03-31 23:00:27 -04:00

fs-writeback.c

writeback: pass in super_block to bdi_start_writeback()

2009-09-26 00:10:40 +02:00

generic_acl.c

New helper - current_umask()

2009-03-31 23:00:26 -04:00

inode.c

vfs: optimize touch_time() too

2009-09-24 07:47:27 -04:00

internal.h

fs: fix overflow in sys_mount() for in-kernel calls

2009-09-24 08:40:15 -04:00

ioctl.c

vfs: explicitly cast s_maxbytes in fiemap_check_ranges

2009-09-24 07:47:31 -04:00

ioprio.c

…

Kconfig

tmpfs: depend on shmem

2009-09-22 07:17:41 -07:00

Kconfig.binfmt

…

libfs.c

libfs: return error code on failed attr set

2009-09-24 07:47:30 -04:00

locks.c

const: make lock_manager_operations const

2009-09-22 07:17:25 -07:00

Makefile

nilfs2: update makefile and Kconfig

2009-04-07 08:31:16 -07:00

mbcache.c

…

mpage.c

ext4: Properly initialize the buffer_head state

2009-05-13 15:13:42 -04:00

namei.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

2009-09-11 08:55:49 -07:00

namespace.c

fs: fix overflow in sys_mount() for in-kernel calls

2009-09-24 08:40:15 -04:00

nfsctl.c

…

no-block.c

…

open.c

fs: change sys_truncate length parameter type

2009-09-23 09:21:05 -07:00

pipe.c

lockdep: Fix lockdep annotation for pipe_double_lock()

2009-07-22 21:14:14 +02:00

pnode.c

…

pnode.h

…

posix_acl.c

…

read_write.c

vfs: remove redundant position check in do_sendfile

2009-09-24 07:47:34 -04:00

read_write.h

…

readdir.c

…

select.c

headers: remove sched.h from poll.h

2009-10-04 15:05:10 -07:00

seq_file.c

vfs: seq_file: add helpers for data filling

2009-09-24 07:47:35 -04:00

signalfd.c

…

splice.c

Merge branch 'for-2.6.32' of git://git.kernel.dk/linux-2.6-block

2009-09-14 17:55:15 -07:00

stack.c

…

stat.c

kill vfs_stat_fd / vfs_lstat_fd

2009-04-20 23:02:52 -04:00

super.c

freeze_bdev: grab active reference to frozen superblocks

2009-09-24 07:47:41 -04:00

sync.c

fs/buffer.c: clean up EXPORT* macros

2009-09-23 07:39:29 -07:00

timerfd.c

timerfd: add flags check

2009-02-18 15:37:53 -08:00

utimes.c

…

xattr_acl.c

…

xattr.c

VFS: Factor out part of vfs_setxattr so it can be called from the SELinux hook for inode_setsecctx.

2009-09-10 10:11:22 +10:00