diff options
Diffstat (limited to 'fs/debugfs/inode.c')
-rw-r--r-- | fs/debugfs/inode.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index c59f015f386e..a9c3d3e9af39 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
@@ -185,6 +185,11 @@ static const struct super_operations debugfs_super_operations = { | |||
185 | .evict_inode = debugfs_evict_inode, | 185 | .evict_inode = debugfs_evict_inode, |
186 | }; | 186 | }; |
187 | 187 | ||
188 | static void debugfs_release_dentry(struct dentry *dentry) | ||
189 | { | ||
190 | kfree(dentry->d_fsdata); | ||
191 | } | ||
192 | |||
188 | static struct vfsmount *debugfs_automount(struct path *path) | 193 | static struct vfsmount *debugfs_automount(struct path *path) |
189 | { | 194 | { |
190 | debugfs_automount_t f; | 195 | debugfs_automount_t f; |
@@ -194,6 +199,7 @@ static struct vfsmount *debugfs_automount(struct path *path) | |||
194 | 199 | ||
195 | static const struct dentry_operations debugfs_dops = { | 200 | static const struct dentry_operations debugfs_dops = { |
196 | .d_delete = always_delete_dentry, | 201 | .d_delete = always_delete_dentry, |
202 | .d_release = debugfs_release_dentry, | ||
197 | .d_automount = debugfs_automount, | 203 | .d_automount = debugfs_automount, |
198 | }; | 204 | }; |
199 | 205 | ||
@@ -341,24 +347,34 @@ static struct dentry *__debugfs_create_file(const char *name, umode_t mode, | |||
341 | { | 347 | { |
342 | struct dentry *dentry; | 348 | struct dentry *dentry; |
343 | struct inode *inode; | 349 | struct inode *inode; |
350 | struct debugfs_fsdata *fsd; | ||
351 | |||
352 | fsd = kmalloc(sizeof(*fsd), GFP_KERNEL); | ||
353 | if (!fsd) | ||
354 | return NULL; | ||
344 | 355 | ||
345 | if (!(mode & S_IFMT)) | 356 | if (!(mode & S_IFMT)) |
346 | mode |= S_IFREG; | 357 | mode |= S_IFREG; |
347 | BUG_ON(!S_ISREG(mode)); | 358 | BUG_ON(!S_ISREG(mode)); |
348 | dentry = start_creating(name, parent); | 359 | dentry = start_creating(name, parent); |
349 | 360 | ||
350 | if (IS_ERR(dentry)) | 361 | if (IS_ERR(dentry)) { |
362 | kfree(fsd); | ||
351 | return NULL; | 363 | return NULL; |
364 | } | ||
352 | 365 | ||
353 | inode = debugfs_get_inode(dentry->d_sb); | 366 | inode = debugfs_get_inode(dentry->d_sb); |
354 | if (unlikely(!inode)) | 367 | if (unlikely(!inode)) { |
368 | kfree(fsd); | ||
355 | return failed_creating(dentry); | 369 | return failed_creating(dentry); |
370 | } | ||
356 | 371 | ||
357 | inode->i_mode = mode; | 372 | inode->i_mode = mode; |
358 | inode->i_private = data; | 373 | inode->i_private = data; |
359 | 374 | ||
360 | inode->i_fop = proxy_fops; | 375 | inode->i_fop = proxy_fops; |
361 | dentry->d_fsdata = (void *)real_fops; | 376 | fsd->real_fops = real_fops; |
377 | dentry->d_fsdata = fsd; | ||
362 | 378 | ||
363 | d_instantiate(dentry, inode); | 379 | d_instantiate(dentry, inode); |
364 | fsnotify_create(d_inode(dentry->d_parent), dentry); | 380 | fsnotify_create(d_inode(dentry->d_parent), dentry); |