From 41309ebbc8b507ddee3ff1315d28929055db3428 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Wed, 12 May 2010 11:42:29 -0400 Subject: [PATCH] --- yaml --- r: 207701 b: refs/heads/master c: fb1cfb88c8597d847553f39efc2bbd41c72c5f50 h: refs/heads/master i: 207699: 102efbc0f266c744715937435653fb45df108acd v: v3 --- [refs] | 2 +- trunk/include/linux/fsnotify.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 503cf3970049..7d83e49df772 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b31d397e430a90cbe9d3656929a7d5f96e986666 +refs/heads/master: fb1cfb88c8597d847553f39efc2bbd41c72c5f50 diff --git a/trunk/include/linux/fsnotify.h b/trunk/include/linux/fsnotify.h index 64efda9aae62..59d0df43ff9d 100644 --- a/trunk/include/linux/fsnotify.h +++ b/trunk/include/linux/fsnotify.h @@ -39,16 +39,18 @@ static inline int fsnotify_perm(struct file *file, int mask) { struct path *path = &file->f_path; struct inode *inode = path->dentry->d_inode; - __u32 fsnotify_mask; + __u32 fsnotify_mask = 0; if (file->f_mode & FMODE_NONOTIFY) return 0; if (!(mask & (MAY_READ | MAY_OPEN))) return 0; - if (mask & MAY_READ) - fsnotify_mask = FS_ACCESS_PERM; if (mask & MAY_OPEN) fsnotify_mask = FS_OPEN_PERM; + else if (mask & MAY_READ) + fsnotify_mask = FS_ACCESS_PERM; + else + BUG(); return fsnotify(inode, fsnotify_mask, path, FSNOTIFY_EVENT_PATH, NULL, 0); }