diff options
Diffstat (limited to 'fs/configfs')
| -rw-r--r-- | fs/configfs/configfs_internal.h | 2 | ||||
| -rw-r--r-- | fs/configfs/inode.c | 17 | ||||
| -rw-r--r-- | fs/configfs/mount.c | 11 |
3 files changed, 2 insertions, 28 deletions
diff --git a/fs/configfs/configfs_internal.h b/fs/configfs/configfs_internal.h index bd4a3c167091..a315677e44d3 100644 --- a/fs/configfs/configfs_internal.h +++ b/fs/configfs/configfs_internal.h | |||
| @@ -70,8 +70,6 @@ extern int configfs_is_root(struct config_item *item); | |||
| 70 | 70 | ||
| 71 | extern struct inode * configfs_new_inode(umode_t mode, struct configfs_dirent *, struct super_block *); | 71 | extern struct inode * configfs_new_inode(umode_t mode, struct configfs_dirent *, struct super_block *); |
| 72 | extern int configfs_create(struct dentry *, umode_t mode, int (*init)(struct inode *)); | 72 | extern int configfs_create(struct dentry *, umode_t mode, int (*init)(struct inode *)); |
| 73 | extern int configfs_inode_init(void); | ||
| 74 | extern void configfs_inode_exit(void); | ||
| 75 | 73 | ||
| 76 | extern int configfs_create_file(struct config_item *, const struct configfs_attribute *); | 74 | extern int configfs_create_file(struct config_item *, const struct configfs_attribute *); |
| 77 | extern int configfs_make_dirent(struct configfs_dirent *, | 75 | extern int configfs_make_dirent(struct configfs_dirent *, |
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c index 5946ad98053f..65af86147154 100644 --- a/fs/configfs/inode.c +++ b/fs/configfs/inode.c | |||
| @@ -50,12 +50,6 @@ static const struct address_space_operations configfs_aops = { | |||
| 50 | .write_end = simple_write_end, | 50 | .write_end = simple_write_end, |
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | static struct backing_dev_info configfs_backing_dev_info = { | ||
| 54 | .name = "configfs", | ||
| 55 | .ra_pages = 0, /* No readahead */ | ||
| 56 | .capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK, | ||
| 57 | }; | ||
| 58 | |||
| 59 | static const struct inode_operations configfs_inode_operations ={ | 53 | static const struct inode_operations configfs_inode_operations ={ |
| 60 | .setattr = configfs_setattr, | 54 | .setattr = configfs_setattr, |
| 61 | }; | 55 | }; |
| @@ -137,7 +131,6 @@ struct inode *configfs_new_inode(umode_t mode, struct configfs_dirent *sd, | |||
| 137 | if (inode) { | 131 | if (inode) { |
| 138 | inode->i_ino = get_next_ino(); | 132 | inode->i_ino = get_next_ino(); |
| 139 | inode->i_mapping->a_ops = &configfs_aops; | 133 | inode->i_mapping->a_ops = &configfs_aops; |
| 140 | inode->i_mapping->backing_dev_info = &configfs_backing_dev_info; | ||
| 141 | inode->i_op = &configfs_inode_operations; | 134 | inode->i_op = &configfs_inode_operations; |
| 142 | 135 | ||
| 143 | if (sd->s_iattr) { | 136 | if (sd->s_iattr) { |
| @@ -283,13 +276,3 @@ void configfs_hash_and_remove(struct dentry * dir, const char * name) | |||
| 283 | } | 276 | } |
| 284 | mutex_unlock(&dir->d_inode->i_mutex); | 277 | mutex_unlock(&dir->d_inode->i_mutex); |
| 285 | } | 278 | } |
| 286 | |||
| 287 | int __init configfs_inode_init(void) | ||
| 288 | { | ||
| 289 | return bdi_init(&configfs_backing_dev_info); | ||
| 290 | } | ||
| 291 | |||
| 292 | void configfs_inode_exit(void) | ||
| 293 | { | ||
| 294 | bdi_destroy(&configfs_backing_dev_info); | ||
| 295 | } | ||
diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c index f6c285833390..da94e41bdbf6 100644 --- a/fs/configfs/mount.c +++ b/fs/configfs/mount.c | |||
| @@ -145,19 +145,13 @@ static int __init configfs_init(void) | |||
| 145 | if (!config_kobj) | 145 | if (!config_kobj) |
| 146 | goto out2; | 146 | goto out2; |
| 147 | 147 | ||
| 148 | err = configfs_inode_init(); | ||
| 149 | if (err) | ||
| 150 | goto out3; | ||
| 151 | |||
| 152 | err = register_filesystem(&configfs_fs_type); | 148 | err = register_filesystem(&configfs_fs_type); |
| 153 | if (err) | 149 | if (err) |
| 154 | goto out4; | 150 | goto out3; |
| 155 | 151 | ||
| 156 | return 0; | 152 | return 0; |
| 157 | out4: | ||
| 158 | pr_err("Unable to register filesystem!\n"); | ||
| 159 | configfs_inode_exit(); | ||
| 160 | out3: | 153 | out3: |
| 154 | pr_err("Unable to register filesystem!\n"); | ||
| 161 | kobject_put(config_kobj); | 155 | kobject_put(config_kobj); |
| 162 | out2: | 156 | out2: |
| 163 | kmem_cache_destroy(configfs_dir_cachep); | 157 | kmem_cache_destroy(configfs_dir_cachep); |
| @@ -172,7 +166,6 @@ static void __exit configfs_exit(void) | |||
| 172 | kobject_put(config_kobj); | 166 | kobject_put(config_kobj); |
| 173 | kmem_cache_destroy(configfs_dir_cachep); | 167 | kmem_cache_destroy(configfs_dir_cachep); |
| 174 | configfs_dir_cachep = NULL; | 168 | configfs_dir_cachep = NULL; |
| 175 | configfs_inode_exit(); | ||
| 176 | } | 169 | } |
| 177 | 170 | ||
| 178 | MODULE_AUTHOR("Oracle"); | 171 | MODULE_AUTHOR("Oracle"); |
