From fe78a4b7085cd56a182e0978235c015fde215fbc Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 25 Jul 2011 00:05:26 -0400 Subject: [PATCH] --- yaml --- r: 280223 b: refs/heads/master c: 439475140bed762c04567c325d48409862341ae4 h: refs/heads/master i: 280221: 6961ceef1ccdd15a2558e1f34a11dc82a16ec651 280219: bdf197067a11761887fc0d18100301797a63b5ac 280215: d0040aa45779a64df6c603ca4823290326da0267 280207: 3e3203781ce7268b78d22c24c8deb828ae016e3a 280191: 5f8a72d3fd4dafdc1884c4c89315c5531eac64fb v: v3 --- [refs] | 2 +- trunk/Documentation/filesystems/configfs/configfs.txt | 2 +- trunk/fs/configfs/configfs_internal.h | 4 ++-- trunk/fs/configfs/inode.c | 6 +++--- trunk/include/linux/configfs.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 17335591bed3..7f688adb55c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbd48a69a0b576dd8cba01b2b4fc24fad76f1b68 +refs/heads/master: 439475140bed762c04567c325d48409862341ae4 diff --git a/trunk/Documentation/filesystems/configfs/configfs.txt b/trunk/Documentation/filesystems/configfs/configfs.txt index dd57bb6bb390..b40fec9d3f53 100644 --- a/trunk/Documentation/filesystems/configfs/configfs.txt +++ b/trunk/Documentation/filesystems/configfs/configfs.txt @@ -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 diff --git a/trunk/fs/configfs/configfs_internal.h b/trunk/fs/configfs/configfs_internal.h index 82bda8fdfc1c..ede857d20a04 100644 --- a/trunk/fs/configfs/configfs_internal.h +++ b/trunk/fs/configfs/configfs_internal.h @@ -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); diff --git a/trunk/fs/configfs/inode.c b/trunk/fs/configfs/inode.c index 9d8715c45f25..3ee36d418863 100644 --- a/trunk/fs/configfs/inode.c +++ b/trunk/fs/configfs/inode.c @@ -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; @@ -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) { @@ -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; diff --git a/trunk/include/linux/configfs.h b/trunk/include/linux/configfs.h index 3081c58d696e..34025df61829 100644 --- a/trunk/include/linux/configfs.h +++ b/trunk/include/linux/configfs.h @@ -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; }; /*