From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wu Fengguang Subject: [PATCH 1/4] fanotify: fix FMODE_NONOTIFY bit number Date: Sun, 07 Feb 2010 11:28:06 +0800 Message-ID: <20100207034223.473443793@intel.com> References: <20100207032805.769788305@intel.com> Cc: Al Viro , Eric Paris , Wu Fengguang To: Andrew Morton Return-path: Received: from mga02.intel.com ([134.134.136.20]:48033 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754055Ab0BGDoH (ORCPT ); Sat, 6 Feb 2010 22:44:07 -0500 CC: Roland Dreier CC: "H. Peter Anvin" CC: Borislav Petkov CC: Jamie Lokier CC: Peter Zijlstra cc: Cc: LKML Content-Disposition: inline; filename=fanotify-bit-fix Sender: linux-fsdevel-owner@vger.kernel.org List-ID: FMODE_NONOTIFY=0x800000 collides with __O_SYNC in sparc, so change it to 0x1000000. CC: Eric Paris Signed-off-by: Wu Fengguang --- include/asm-generic/fcntl.h | 2 +- include/linux/fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- linux.orig/include/asm-generic/fcntl.h 2010-01-05 10:42:36.000000000 +0800 +++ linux/include/asm-generic/fcntl.h 2010-01-05 10:42:57.000000000 +0800 @@ -5,7 +5,7 @@ /* * FMODE_EXEC is 0x20 - * FMODE_NONOTIFY is 0x800000 + * FMODE_NONOTIFY is 0x1000000 * These cannot be used by userspace O_* until internal and external open * flags are split. * -Eric Paris --- linux.orig/include/linux/fs.h 2010-01-05 10:40:33.000000000 +0800 +++ linux/include/linux/fs.h 2010-01-05 10:42:07.000000000 +0800 @@ -88,7 +88,7 @@ struct inodes_stat_t { #define FMODE_NOCMTIME ((__force fmode_t)2048) /* File was opened by fanotify and shouldn't generate fanotify events */ -#define FMODE_NONOTIFY ((__force fmode_t)8388608) +#define FMODE_NONOTIFY ((__force fmode_t)0x1000000) /* * The below are the various read and write types that we support. Some of