Commit 8c8946f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify 

* 'for-linus' of git://git.infradead.org/users/eparis/notify: (132 commits)
  fanotify: use both marks when possible
  fsnotify: pass both the vfsmount mark and inode mark
  fsnotify: walk the inode and vfsmount lists simultaneously
  fsnotify: rework ignored mark flushing
  fsnotify: remove global fsnotify groups lists
  fsnotify: remove group->mask
  fsnotify: remove the global masks
  fsnotify: cleanup should_send_event
  fanotify: use the mark in handler functions
  audit: use the mark in handler functions
  dnotify: use the mark in handler functions
  inotify: use the mark in handler functions
  fsnotify: send fsnotify_mark to groups in event handling functions
  fsnotify: Exchange list heads instead of moving elements
  fsnotify: srcu to protect read side of inode and vfsmount locks
  fsnotify: use an explicit flag to indicate fsnotify_destroy_mark has been called
  fsnotify: use _rcu functions for mark list traversal
  fsnotify: place marks on object in order of group memory address
  vfs/fsnotify: fsnotify_close can delay the final work in fput
  fsnotify: store struct file not struct path
  ...

Fix up trivial delete/modify conflict in fs/notify/inotify/inotify.c.
parents 5f248c9c 1968f5ee

Documentation/feature-removal-schedule.txt

+0 −8
Original line number Diff line number Diff line
@@ -360,14 +360,6 @@ When: 2.6.33 
Why:	Should be implemented in userspace, policy daemon.

Who:	Johannes Berg <johannes@sipsolutions.net>



---------------------------



What:	CONFIG_INOTIFY

When:	2.6.33

Why:	last user (audit) will be converted to the newer more generic

	and more easily maintained fsnotify subsystem

Who:	Eric Paris <eparis@redhat.com>



----------------------------



What:	sound-slot/service-* module aliases and related clutters in

arch/x86/ia32/ia32entry.S

+2 −0
Original line number Diff line number Diff line
@@ -842,4 +842,6 @@ ia32_sys_call_table: 
	.quad compat_sys_rt_tgsigqueueinfo	/* 335 */

	.quad sys_perf_event_open

	.quad compat_sys_recvmmsg

	.quad sys_fanotify_init

	.quad sys32_fanotify_mark

ia32_syscall_end:

arch/x86/ia32/sys_ia32.c

+9 −0
Original line number Diff line number Diff line
@@ -546,3 +546,12 @@ asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_lo, 
	return sys_fallocate(fd, mode, ((u64)offset_hi << 32) | offset_lo,

			     ((u64)len_hi << 32) | len_lo);

}



asmlinkage long sys32_fanotify_mark(int fanotify_fd, unsigned int flags,

				    u32 mask_lo, u32 mask_hi,

				    int fd, const char  __user *pathname)

{

	return sys_fanotify_mark(fanotify_fd, flags,

				 ((u64)mask_hi << 32) | mask_lo,

				 fd, pathname);

}

arch/x86/include/asm/sys_ia32.h

+3 −0
Original line number Diff line number Diff line
@@ -80,4 +80,7 @@ asmlinkage long sys32_rt_sigreturn(struct pt_regs *); 


/* ia32/ipc32.c */

asmlinkage long sys32_ipc(u32, int, int, int, compat_uptr_t, u32);



asmlinkage long sys32_fanotify_mark(int, unsigned int, u32, u32, int,

				    const char __user *);

#endif /* _ASM_X86_SYS_IA32_H */

arch/x86/include/asm/unistd_32.h

+3 −1
Original line number Diff line number Diff line
@@ -343,10 +343,12 @@ 
#define __NR_rt_tgsigqueueinfo	335

#define __NR_perf_event_open	336

#define __NR_recvmmsg		337

#define __NR_fanotify_init	338

#define __NR_fanotify_mark	339



#ifdef __KERNEL__



#define NR_syscalls 338

#define NR_syscalls 340



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

CRA Git | Maintained and supported by SUSTech CRA and CCSE