Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 280223
b: refs/heads/master
c: 4394751
h: refs/heads/master
i:
  280221: 6961cee
  280219: bdf1970
  280215: d0040aa
  280207: 3e32037
  280191: 5f8a72d
v: v3
  • Loading branch information
Al Viro committed Jan 4, 2012
1 parent d4b2bab commit fe78a4b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fbd48a69a0b576dd8cba01b2b4fc24fad76f1b68
refs/heads/master: 439475140bed762c04567c325d48409862341ae4
2 changes: 1 addition & 1 deletion trunk/Documentation/filesystems/configfs/configfs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ attribute value uses the store_attribute() method.
struct configfs_attribute {
char *ca_name;
struct module *ca_owner;
mode_t ca_mode;
umode_t ca_mode;
};

When a config_item wants an attribute to appear as a file in the item's
Expand Down
4 changes: 2 additions & 2 deletions trunk/fs/configfs/configfs_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ extern struct kmem_cache *configfs_dir_cachep;

extern int configfs_is_root(struct config_item *item);

extern struct inode * configfs_new_inode(mode_t mode, struct configfs_dirent *);
extern int configfs_create(struct dentry *, int mode, int (*init)(struct inode *));
extern struct inode * configfs_new_inode(umode_t mode, struct configfs_dirent *);
extern int configfs_create(struct dentry *, umode_t mode, int (*init)(struct inode *));
extern int configfs_inode_init(void);
extern void configfs_inode_exit(void);

Expand Down
6 changes: 3 additions & 3 deletions trunk/fs/configfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr)
return error;
}

static inline void set_default_inode_attr(struct inode * inode, mode_t mode)
static inline void set_default_inode_attr(struct inode * inode, umode_t mode)
{
inode->i_mode = mode;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
Expand All @@ -132,7 +132,7 @@ static inline void set_inode_attr(struct inode * inode, struct iattr * iattr)
inode->i_ctime = iattr->ia_ctime;
}

struct inode * configfs_new_inode(mode_t mode, struct configfs_dirent * sd)
struct inode *configfs_new_inode(umode_t mode, struct configfs_dirent * sd)
{
struct inode * inode = new_inode(configfs_sb);
if (inode) {
Expand Down Expand Up @@ -185,7 +185,7 @@ static void configfs_set_inode_lock_class(struct configfs_dirent *sd,

#endif /* CONFIG_LOCKDEP */

int configfs_create(struct dentry * dentry, int mode, int (*init)(struct inode *))
int configfs_create(struct dentry * dentry, umode_t mode, int (*init)(struct inode *))
{
int error = 0;
struct inode * inode = NULL;
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/configfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ extern struct config_item *config_group_find_item(struct config_group *,
struct configfs_attribute {
const char *ca_name;
struct module *ca_owner;
mode_t ca_mode;
umode_t ca_mode;
};

/*
Expand Down

0 comments on commit fe78a4b

Please sign in to comment.