Skip to content

Commit

Permalink
mode_t, whack-a-mole at 11...
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Al Viro committed Apr 9, 2013
1 parent aee0c61 commit 0ecc833
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/ath/wil6210/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_iomem_x32, wil_debugfs_iomem_x32_get,
wil_debugfs_iomem_x32_set, "0x%08llx\n");

static struct dentry *wil_debugfs_create_iomem_x32(const char *name,
mode_t mode,
umode_t mode,
struct dentry *parent,
void __iomem *value)
{
Expand Down Expand Up @@ -367,7 +367,7 @@ static const struct file_operations fops_ioblob = {

static
struct dentry *wil_debugfs_create_ioblob(const char *name,
mode_t mode,
umode_t mode,
struct dentry *parent,
struct debugfs_blob_wrapper *blob)
{
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/dgrp/dgrp_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ enum {
struct dgrp_proc_entry {
int id; /* Integer identifier */
const char *name; /* ASCII identifier */
mode_t mode; /* File access permissions */
umode_t mode; /* File access permissions */
struct dgrp_proc_entry *child; /* Child pointer */

/* file ops to use, pass NULL to use default */
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/dgrp/dgrp_specproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ static void register_proc_table(struct dgrp_proc_entry *table,
{
struct proc_dir_entry *de;
int len;
mode_t mode;
umode_t mode;

if (table == NULL)
return;
Expand Down
2 changes: 1 addition & 1 deletion fs/f2fs/acl.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ int f2fs_acl_chmod(struct inode *inode)
struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
struct posix_acl *acl;
int error;
mode_t mode = get_inode_mode(inode);
umode_t mode = get_inode_mode(inode);

if (!test_opt(sbi, POSIX_ACL))
return 0;
Expand Down
2 changes: 1 addition & 1 deletion fs/f2fs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static unsigned char f2fs_type_by_mode[S_IFMT >> S_SHIFT] = {

static void set_de_type(struct f2fs_dir_entry *de, struct inode *inode)
{
mode_t mode = inode->i_mode;
umode_t mode = inode->i_mode;
de->file_type = f2fs_type_by_mode[(mode & S_IFMT) >> S_SHIFT];
}

Expand Down
2 changes: 1 addition & 1 deletion fs/proc/self.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ static const struct inode_operations proc_self_inode_operations = {
void __init proc_self_init(void)
{
struct proc_dir_entry *proc_self_symlink;
mode_t mode;
umode_t mode;

mode = S_IFLNK | S_IRWXUGO;
proc_self_symlink = proc_create("self", mode, NULL, NULL );
Expand Down
4 changes: 2 additions & 2 deletions lib/notifier-error-inject.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ static int debugfs_errno_get(void *data, u64 *val)
DEFINE_SIMPLE_ATTRIBUTE(fops_errno, debugfs_errno_get, debugfs_errno_set,
"%lld\n");

static struct dentry *debugfs_create_errno(const char *name, mode_t mode,
static struct dentry *debugfs_create_errno(const char *name, umode_t mode,
struct dentry *parent, int *value)
{
return debugfs_create_file(name, mode, parent, value, &fops_errno);
Expand Down Expand Up @@ -50,7 +50,7 @@ struct dentry *notifier_err_inject_init(const char *name, struct dentry *parent,
struct notifier_err_inject *err_inject, int priority)
{
struct notifier_err_inject_action *action;
mode_t mode = S_IFREG | S_IRUSR | S_IWUSR;
umode_t mode = S_IFREG | S_IRUSR | S_IWUSR;
struct dentry *dir;
struct dentry *actions_dir;

Expand Down

0 comments on commit 0ecc833

Please sign in to comment.