From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [folded] vfs-o_-bit-numbers-uniqueness-check-fix-2.patch removed from -mm tree Date: Tue, 27 Apr 2010 11:41:06 -0700 Message-ID: <201004271908.o3RJ8VJ5014263@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:54278 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754300Ab0D0TJC (ORCPT ); Tue, 27 Apr 2010 15:09:02 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: fengguang.wu@intel.com, eparis@redhat.com, mm-commits@vger.kernel.org The patch titled vfs: O_* bit numbers uniqueness check fix 2 has been removed from the -mm tree. Its filename was vfs-o_-bit-numbers-uniqueness-check-fix-2.patch This patch was dropped because it was folded into vfs-o_-bit-numbers-uniqueness-check.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: vfs: O_* bit numbers uniqueness check fix 2 From: Wu Fengguang Follow the comment by Eric: Until the FMODE_ and O_ bits do not overload I think we need to check FMODE_EXEC and FMODE_NONOTIFY (if you have that one) inside fcntl_init() as well. I guess I'll send a patch to someone ?Al? to add FMODE_EXEC to the list.... Signed-off-by: Wu Fengguang Cc: Eric Paris Signed-off-by: Andrew Morton --- fs/fcntl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN fs/fcntl.c~vfs-o_-bit-numbers-uniqueness-check-fix-2 fs/fcntl.c --- a/fs/fcntl.c~vfs-o_-bit-numbers-uniqueness-check-fix-2 +++ a/fs/fcntl.c @@ -742,13 +742,14 @@ EXPORT_SYMBOL(kill_fasync); static int __init fcntl_init(void) { /* please add new bits here to ensure allocation uniqueness */ - BUILD_BUG_ON(18 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32( + BUILD_BUG_ON(19 - 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 + O_NOFOLLOW | O_NOATIME | O_CLOEXEC | + FMODE_EXEC )); fasync_cache = kmem_cache_create("fasync_cache", _ Patches currently in -mm which might be from fengguang.wu@intel.com are 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-fix-2.patch vfs-introduce-fmode_neg_offset-for-allowing-negative-f_pos.patch vmscan-prevent-get_scan_ratio-rounding-errors.patch readaheadc-fix-comment.patch fs-writeback-check-sync-bit-earlier-in-inode_wait_for_writeback.patch vfs-add-super-operation-writeback_inodes.patch