Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit c88b1e70aeaa38aa20e67e436f28c4d36c0b9f4b

Authored by Al Viro
1 parent dbca51ddb0
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

configfs: configfs_create() init callback is never NULL and it never fails 

... so make it return void and drop the check for it being non-NULL

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 3 changed files with 6 additions and 15 deletions Side-by-side Diff

fs/configfs/configfs_internal.h
Diff comments   View file @ c88b1e7
... ... @@ -69,7 +69,7 @@
69 69 extern int configfs_is_root(struct config_item *item);
70 70  
71 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, void (*init)(struct inode *));
73 73  
74 74 extern int configfs_create_file(struct config_item *, const struct configfs_attribute *);
75 75 extern int configfs_make_dirent(struct configfs_dirent *,
... ... @@ -240,27 +240,24 @@
240 240 return 0;
241 241 }
242 242  
243   -static int init_dir(struct inode * inode)
  243 +static void init_dir(struct inode * inode)
244 244 {
245 245 inode->i_op = &configfs_dir_inode_operations;
246 246 inode->i_fop = &configfs_dir_operations;
247 247  
248 248 /* directory inodes start off with i_nlink == 2 (for "." entry) */
249 249 inc_nlink(inode);
250   - return 0;
251 250 }
252 251  
253   -static int configfs_init_file(struct inode * inode)
  252 +static void configfs_init_file(struct inode * inode)
254 253 {
255 254 inode->i_size = PAGE_SIZE;
256 255 inode->i_fop = &configfs_file_operations;
257   - return 0;
258 256 }
259 257  
260   -static int init_symlink(struct inode * inode)
  258 +static void init_symlink(struct inode * inode)
261 259 {
262 260 inode->i_op = &configfs_symlink_inode_operations;
263   - return 0;
264 261 }
265 262  
266 263 static int create_dir(struct config_item *k, struct dentry *d)
... ... @@ -176,7 +176,7 @@
176 176  
177 177 #endif /* CONFIG_LOCKDEP */
178 178  
179   -int configfs_create(struct dentry * dentry, umode_t mode, int (*init)(struct inode *))
  179 +int configfs_create(struct dentry * dentry, umode_t mode, void (*init)(struct inode *))
180 180 {
181 181 int error = 0;
182 182 struct inode *inode = NULL;
... ... @@ -198,13 +198,7 @@
198 198 p_inode->i_mtime = p_inode->i_ctime = CURRENT_TIME;
199 199 configfs_set_inode_lock_class(sd, inode);
200 200  
201   - if (init) {
202   - error = init(inode);
203   - if (error) {
204   - iput(inode);
205   - return error;
206   - }
207   - }
  201 + init(inode);
208 202 d_instantiate(dentry, inode);
209 203 if (S_ISDIR(mode) || S_ISLNK(mode))
210 204 dget(dentry); /* pin link and directory dentries in core */