The patch titled
Subject: vfs: renumber FMODE_NONOTIFY and add to uniqueness check
has been removed from the -mm tree. Its filename was
vfs-renumber-fmode_nonotify-and-add-to-uniqueness-check.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: David Drysdale <drysdale@xxxxxxxxxx>
Subject: 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 5229645bdc35f1cc43eb ("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 (12ed2e36c98aec6c4155, "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@xxxxxxxxxx>
Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>
Acked-by: Jan Kara <jack@xxxxxxx>
Cc: Heinrich Schuchardt <xypron.glpk@xxxxxx>
Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Eric Paris <eparis@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/fcntl.c | 5 +++--
include/linux/fs.h | 2 +-
include/uapi/asm-generic/fcntl.h | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff -puN fs/fcntl.c~vfs-renumber-fmode_nonotify-and-add-to-uniqueness-check fs/fcntl.c
--- a/fs/fcntl.c~vfs-renumber-fmode_nonotify-and-add-to-uniqueness-check
+++ a/fs/fcntl.c
@@ -740,14 +740,15 @@ static int __init fcntl_init(void)
* Exceptions: O_NONBLOCK is a two bit define on parisc; O_NDELAY
* is defined as O_NONBLOCK on some platforms and not on others.
*/
- BUILD_BUG_ON(20 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
+ BUILD_BUG_ON(21 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
O_RDONLY | O_WRONLY | O_RDWR |
O_CREAT | O_EXCL | O_NOCTTY |
O_TRUNC | O_APPEND | /* O_NONBLOCK | */
__O_SYNC | O_DSYNC | FASYNC |
O_DIRECT | O_LARGEFILE | O_DIRECTORY |
O_NOFOLLOW | O_NOATIME | O_CLOEXEC |
- __FMODE_EXEC | O_PATH | __O_TMPFILE
+ __FMODE_EXEC | O_PATH | __O_TMPFILE |
+ __FMODE_NONOTIFY
));
fasync_cache = kmem_cache_create("fasync_cache",
diff -puN include/linux/fs.h~vfs-renumber-fmode_nonotify-and-add-to-uniqueness-check include/linux/fs.h
--- a/include/linux/fs.h~vfs-renumber-fmode_nonotify-and-add-to-uniqueness-check
+++ a/include/linux/fs.h
@@ -135,7 +135,7 @@ typedef void (dio_iodone_t)(struct kiocb
#define FMODE_CAN_WRITE ((__force fmode_t)0x40000)
/* File was opened by fanotify and shouldn't generate fanotify events */
-#define FMODE_NONOTIFY ((__force fmode_t)0x1000000)
+#define FMODE_NONOTIFY ((__force fmode_t)0x4000000)
/*
* Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector
diff -puN include/uapi/asm-generic/fcntl.h~vfs-renumber-fmode_nonotify-and-add-to-uniqueness-check include/uapi/asm-generic/fcntl.h
--- a/include/uapi/asm-generic/fcntl.h~vfs-renumber-fmode_nonotify-and-add-to-uniqueness-check
+++ a/include/uapi/asm-generic/fcntl.h
@@ -5,7 +5,7 @@
/*
* FMODE_EXEC is 0x20
- * FMODE_NONOTIFY is 0x1000000
+ * FMODE_NONOTIFY is 0x4000000
* These cannot be used by userspace O_* until internal and external open
* flags are split.
* -Eric Paris
_
Patches currently in -mm which might be from drysdale@xxxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
