summaryrefslogtreecommitdiff
path: root/include/linux/fsnotify.h
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-05-12 19:42:29 +0400
committerEric Paris <eparis@redhat.com>2010-07-28 17:59:02 +0400
commitfb1cfb88c8597d847553f39efc2bbd41c72c5f50 (patch)
tree0f94e05ee3e643db398738dae2977c45105d1f42 /include/linux/fsnotify.h
parentb31d397e430a90cbe9d3656929a7d5f96e986666 (diff)
downloadlinux-fb1cfb88c8597d847553f39efc2bbd41c72c5f50.tar.xz
fsnotify: initialize mask in fsnotify_perm
akpm got a warning the fsnotify_mask could be used uninitialized in fsnotify_perm(). It's not actually possible but his compiler complained about it. This patch just initializes it to 0 to shut up the compiler. Reported-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'include/linux/fsnotify.h')
-rw-r--r--include/linux/fsnotify.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index 64efda9aae62..59d0df43ff9d 100644
--- a/include/linux/fsnotify.h
+++ b/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);
}