diff options
author | David Drysdale <[email protected]> | 2015-01-08 14:32:29 -0800 |
---|---|---|
committer | Linus Torvalds <[email protected]> | 2015-01-08 15:10:52 -0800 |
commit | 75069f2b5bfb5164beafaf3da597279c25b5535a (patch) | |
tree | 3e4c493569118ce0c4872fc9b496986d7bb7e52f /net/lapb/lapb_subr.c | |
parent | 9de93e7873f5f6c4d0768649d404703a62a51610 (diff) |
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 5229645bdc35 ("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 12ed2e36c98a: "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 <[email protected]>
Acked-by: David S. Miller <[email protected]>
Acked-by: Jan Kara <[email protected]>
Cc: Heinrich Schuchardt <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Stephen Rothwell <[email protected]>
Cc: Eric Paris <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions