From 46aa6109ccd34a3674721bc5bcef2acf5fb39e54 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Tue, 1 Feb 2011 15:52:46 -0800 Subject: [PATCH] --- yaml --- r: 232736 b: refs/heads/master c: 1a44bc8c7cfe69756a116d38aef992d50fc1969d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/fs.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 61fe8b3d221e..139f17f5230c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3751d60430fe4c26460a5ca8ad8672d32f93bcb1 +refs/heads/master: 1a44bc8c7cfe69756a116d38aef992d50fc1969d diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 32b38cd829d3..675678a01f50 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -2555,9 +2555,11 @@ int proc_nr_inodes(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); int __init get_filesystem_list(char *buf); +#define __FMODE_NONOTIFY ((__force int) FMODE_NONOTIFY) + #define ACC_MODE(x) ("\004\002\006\006"[(x)&O_ACCMODE]) #define OPEN_FMODE(flag) ((__force fmode_t)(((flag + 1) & O_ACCMODE) | \ - (flag & FMODE_NONOTIFY))) + (flag & __FMODE_NONOTIFY))) #endif /* __KERNEL__ */ #endif /* _LINUX_FS_H */