David Drysdale 75069f2b5b vfs: renumber FMODE_NONOTIFY and add to uniqueness check ... Fix clashing values for O_PATH and FMODE_NONOTIFY on sparc. The clashing O_PATH value was added in commit 5229645bdc ("vfs: add nonconflicting values for O_PATH") but this can't be changed as it is user-visible. FMODE_NONOTIFY is only used internally in the kernel, but it is in the same numbering space as the other O_* flags, as indicated by the comment at the top of include/uapi/asm-generic/fcntl.h (and its use in fs/notify/fanotify/fanotify_user.c). So renumber it to avoid the clash. All of this has happened before (commit 12ed2e36c9: "fanotify: FMODE_NONOTIFY and __O_SYNC in sparc conflict"), and all of this will happen again -- so update the uniqueness check in fcntl_init() to include __FMODE_NONOTIFY. Signed-off-by: David Drysdale <drysdale@google.com> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Jan Kara <jack@suse.cz> Cc: Heinrich Schuchardt <xypron.glpk@gmx.de> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Eric Paris <eparis@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2015-01-08 15:10:52 -08:00
..
asm-generic	vfs: renumber FMODE_NONOTIFY and add to uniqueness check	2015-01-08 15:10:52 -08:00
drm	Merge tag 'drm-intel-next-2014-11-21-fixed' of git://anongit.freedesktop.org/drm-intel into drm-next	2014-12-03 08:25:59 +10:00
linux	vhost: virtio 1.0 bugfix	2015-01-02 12:07:50 -08:00
misc	cxl: Add documentation for userspace APIs	2014-10-08 20:16:19 +11:00
mtd
rdma	IB/core: Add flags for on demand paging support	2014-12-15 18:13:35 -08:00
scsi
sound	ALSA: oxfw: Add hwdep interface	2014-12-10 10:50:00 +01:00
video
xen
Kbuild	cxl: Add userspace header file	2014-10-08 20:15:57 +11:00