aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-05-12 11:42:29 -0400
committerEric Paris <eparis@redhat.com>2010-07-28 09:59:02 -0400
commitfb1cfb88c8597d847553f39efc2bbd41c72c5f50 (patch)
tree0f94e05ee3e643db398738dae2977c45105d1f42 /include
parentb31d397e430a90cbe9d3656929a7d5f96e986666 (diff)
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')
-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 64efda9aae6..59d0df43ff9 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)
39{ 39{
40 struct path *path = &file->f_path; 40 struct path *path = &file->f_path;
41 struct inode *inode = path->dentry->d_inode; 41 struct inode *inode = path->dentry->d_inode;
42 __u32 fsnotify_mask; 42 __u32 fsnotify_mask = 0;
43 43
44 if (file->f_mode & FMODE_NONOTIFY) 44 if (file->f_mode & FMODE_NONOTIFY)
45 return 0; 45 return 0;
46 if (!(mask & (MAY_READ | MAY_OPEN))) 46 if (!(mask & (MAY_READ | MAY_OPEN)))
47 return 0; 47 return 0;
48 if (mask & MAY_READ)
49 fsnotify_mask = FS_ACCESS_PERM;
50 if (mask & MAY_OPEN) 48 if (mask & MAY_OPEN)
51 fsnotify_mask = FS_OPEN_PERM; 49 fsnotify_mask = FS_OPEN_PERM;
50 else if (mask & MAY_READ)
51 fsnotify_mask = FS_ACCESS_PERM;
52 else
53 BUG();
52 54
53 return fsnotify(inode, fsnotify_mask, path, FSNOTIFY_EVENT_PATH, NULL, 0); 55 return fsnotify(inode, fsnotify_mask, path, FSNOTIFY_EVENT_PATH, NULL, 0);
54} 56}