diff options
-rw-r--r-- | drivers/net/wireless/ath/wil6210/debugfs.c | 4 | ||||
-rw-r--r-- | drivers/staging/dgrp/dgrp_common.h | 2 | ||||
-rw-r--r-- | drivers/staging/dgrp/dgrp_specproc.c | 2 | ||||
-rw-r--r-- | fs/f2fs/acl.c | 2 | ||||
-rw-r--r-- | fs/f2fs/dir.c | 2 | ||||
-rw-r--r-- | fs/proc/self.c | 2 | ||||
-rw-r--r-- | lib/notifier-error-inject.c | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c index 65fc9683bfd8..76c7694518d9 100644 --- a/drivers/net/wireless/ath/wil6210/debugfs.c +++ b/drivers/net/wireless/ath/wil6210/debugfs.c | |||
@@ -216,7 +216,7 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_iomem_x32, wil_debugfs_iomem_x32_get, | |||
216 | wil_debugfs_iomem_x32_set, "0x%08llx\n"); | 216 | wil_debugfs_iomem_x32_set, "0x%08llx\n"); |
217 | 217 | ||
218 | static struct dentry *wil_debugfs_create_iomem_x32(const char *name, | 218 | static struct dentry *wil_debugfs_create_iomem_x32(const char *name, |
219 | mode_t mode, | 219 | umode_t mode, |
220 | struct dentry *parent, | 220 | struct dentry *parent, |
221 | void __iomem *value) | 221 | void __iomem *value) |
222 | { | 222 | { |
@@ -367,7 +367,7 @@ static const struct file_operations fops_ioblob = { | |||
367 | 367 | ||
368 | static | 368 | static |
369 | struct dentry *wil_debugfs_create_ioblob(const char *name, | 369 | struct dentry *wil_debugfs_create_ioblob(const char *name, |
370 | mode_t mode, | 370 | umode_t mode, |
371 | struct dentry *parent, | 371 | struct dentry *parent, |
372 | struct debugfs_blob_wrapper *blob) | 372 | struct debugfs_blob_wrapper *blob) |
373 | { | 373 | { |
diff --git a/drivers/staging/dgrp/dgrp_common.h b/drivers/staging/dgrp/dgrp_common.h index 0583fe9c7b03..fde116236e98 100644 --- a/drivers/staging/dgrp/dgrp_common.h +++ b/drivers/staging/dgrp/dgrp_common.h | |||
@@ -120,7 +120,7 @@ enum { | |||
120 | struct dgrp_proc_entry { | 120 | struct dgrp_proc_entry { |
121 | int id; /* Integer identifier */ | 121 | int id; /* Integer identifier */ |
122 | const char *name; /* ASCII identifier */ | 122 | const char *name; /* ASCII identifier */ |
123 | mode_t mode; /* File access permissions */ | 123 | umode_t mode; /* File access permissions */ |
124 | struct dgrp_proc_entry *child; /* Child pointer */ | 124 | struct dgrp_proc_entry *child; /* Child pointer */ |
125 | 125 | ||
126 | /* file ops to use, pass NULL to use default */ | 126 | /* file ops to use, pass NULL to use default */ |
diff --git a/drivers/staging/dgrp/dgrp_specproc.c b/drivers/staging/dgrp/dgrp_specproc.c index 73f287f96604..dddf8a2e396b 100644 --- a/drivers/staging/dgrp/dgrp_specproc.c +++ b/drivers/staging/dgrp/dgrp_specproc.c | |||
@@ -228,7 +228,7 @@ static void register_proc_table(struct dgrp_proc_entry *table, | |||
228 | { | 228 | { |
229 | struct proc_dir_entry *de; | 229 | struct proc_dir_entry *de; |
230 | int len; | 230 | int len; |
231 | mode_t mode; | 231 | umode_t mode; |
232 | 232 | ||
233 | if (table == NULL) | 233 | if (table == NULL) |
234 | return; | 234 | return; |
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c index 137af4255da6..44abc2f286e0 100644 --- a/fs/f2fs/acl.c +++ b/fs/f2fs/acl.c | |||
@@ -299,7 +299,7 @@ int f2fs_acl_chmod(struct inode *inode) | |||
299 | struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); | 299 | struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); |
300 | struct posix_acl *acl; | 300 | struct posix_acl *acl; |
301 | int error; | 301 | int error; |
302 | mode_t mode = get_inode_mode(inode); | 302 | umode_t mode = get_inode_mode(inode); |
303 | 303 | ||
304 | if (!test_opt(sbi, POSIX_ACL)) | 304 | if (!test_opt(sbi, POSIX_ACL)) |
305 | return 0; | 305 | return 0; |
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index a1f38443ecee..1be948768e2f 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c | |||
@@ -60,7 +60,7 @@ static unsigned char f2fs_type_by_mode[S_IFMT >> S_SHIFT] = { | |||
60 | 60 | ||
61 | static void set_de_type(struct f2fs_dir_entry *de, struct inode *inode) | 61 | static void set_de_type(struct f2fs_dir_entry *de, struct inode *inode) |
62 | { | 62 | { |
63 | mode_t mode = inode->i_mode; | 63 | umode_t mode = inode->i_mode; |
64 | de->file_type = f2fs_type_by_mode[(mode & S_IFMT) >> S_SHIFT]; | 64 | de->file_type = f2fs_type_by_mode[(mode & S_IFMT) >> S_SHIFT]; |
65 | } | 65 | } |
66 | 66 | ||
diff --git a/fs/proc/self.c b/fs/proc/self.c index aa5cc3bff140..d8a025296613 100644 --- a/fs/proc/self.c +++ b/fs/proc/self.c | |||
@@ -51,7 +51,7 @@ static const struct inode_operations proc_self_inode_operations = { | |||
51 | void __init proc_self_init(void) | 51 | void __init proc_self_init(void) |
52 | { | 52 | { |
53 | struct proc_dir_entry *proc_self_symlink; | 53 | struct proc_dir_entry *proc_self_symlink; |
54 | mode_t mode; | 54 | umode_t mode; |
55 | 55 | ||
56 | mode = S_IFLNK | S_IRWXUGO; | 56 | mode = S_IFLNK | S_IRWXUGO; |
57 | proc_self_symlink = proc_create("self", mode, NULL, NULL ); | 57 | proc_self_symlink = proc_create("self", mode, NULL, NULL ); |
diff --git a/lib/notifier-error-inject.c b/lib/notifier-error-inject.c index 44b92cb6224f..eb4a04afea80 100644 --- a/lib/notifier-error-inject.c +++ b/lib/notifier-error-inject.c | |||
@@ -17,7 +17,7 @@ static int debugfs_errno_get(void *data, u64 *val) | |||
17 | DEFINE_SIMPLE_ATTRIBUTE(fops_errno, debugfs_errno_get, debugfs_errno_set, | 17 | DEFINE_SIMPLE_ATTRIBUTE(fops_errno, debugfs_errno_get, debugfs_errno_set, |
18 | "%lld\n"); | 18 | "%lld\n"); |
19 | 19 | ||
20 | static struct dentry *debugfs_create_errno(const char *name, mode_t mode, | 20 | static struct dentry *debugfs_create_errno(const char *name, umode_t mode, |
21 | struct dentry *parent, int *value) | 21 | struct dentry *parent, int *value) |
22 | { | 22 | { |
23 | return debugfs_create_file(name, mode, parent, value, &fops_errno); | 23 | return debugfs_create_file(name, mode, parent, value, &fops_errno); |
@@ -50,7 +50,7 @@ struct dentry *notifier_err_inject_init(const char *name, struct dentry *parent, | |||
50 | struct notifier_err_inject *err_inject, int priority) | 50 | struct notifier_err_inject *err_inject, int priority) |
51 | { | 51 | { |
52 | struct notifier_err_inject_action *action; | 52 | struct notifier_err_inject_action *action; |
53 | mode_t mode = S_IFREG | S_IRUSR | S_IWUSR; | 53 | umode_t mode = S_IFREG | S_IRUSR | S_IWUSR; |
54 | struct dentry *dir; | 54 | struct dentry *dir; |
55 | struct dentry *actions_dir; | 55 | struct dentry *actions_dir; |
56 | 56 | ||