The patch titled vfs: O_* bit numbers uniqueness check fix has been added to the -mm tree. Its filename is vfs-o_-bit-numbers-uniqueness-check-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: vfs: O_* bit numbers uniqueness check fix From: Wu Fengguang <fengguang.wu@xxxxxxxxx> Follow the comment by Andreas: It's non-obvious why there are 18 flags listed here, but the hweight is only 17? Presumably this is because O_RDONLY has value 0, but that should at least be listed in a comment, or the test could be written more explicitly, like: BUILD_BUG_ON(18 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32( Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> Cc: Andreas Dilger <adilger@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/fcntl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/fcntl.c~vfs-o_-bit-numbers-uniqueness-check-fix fs/fcntl.c --- a/fs/fcntl.c~vfs-o_-bit-numbers-uniqueness-check-fix +++ a/fs/fcntl.c @@ -742,7 +742,7 @@ EXPORT_SYMBOL(kill_fasync); static int __init fcntl_init(void) { /* please add new bits here to ensure allocation uniqueness */ - BUILD_BUG_ON(17 != HWEIGHT32( + BUILD_BUG_ON(18 - 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 | _ Patches currently in -mm which might be from fengguang.wu@xxxxxxxxx are origin.patch linux-next.patch include-linux-fsh-complete-hexification-of-fmode_-constants.patch vfs-o_-bit-numbers-uniqueness-check.patch vfs-o_-bit-numbers-uniqueness-check-update.patch vfs-o_-bit-numbers-uniqueness-check-fix.patch vfs-o_-bit-numbers-uniqueness-check-fix-2.patch vfs-introduce-fmode_neg_offset-for-allowing-negative-f_pos.patch vfs-add-super-operation-writeback_inodes.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