diff options
| author | Arend van Spriel <arend@broadcom.com> | 2012-05-23 09:13:07 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 19:40:41 -0400 |
| commit | a59d6293e5372d7c35212932e083e2a541151eff (patch) | |
| tree | a10dd1c0874517e8cbc3dc0d4300920d42fbeca5 /fs/debugfs | |
| parent | 0998d0631001288a5974afc0b2a5f568bcdecb4d (diff) | |
debugfs: change parameter check in debugfs_remove() functions
The dentry parameter in debugfs_remove() and debugfs_remove_recursive()
is checked being a NULL pointer. To make cleanup by callers easier this
check is extended using the IS_ERR_OR_NULL macro instead because the
debugfs_create_... functions can return a ERR_PTR() value.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/debugfs')
| -rw-r--r-- | fs/debugfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index b80bc846a15a..0de5e26870c3 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c | |||
| @@ -498,7 +498,7 @@ void debugfs_remove(struct dentry *dentry) | |||
| 498 | struct dentry *parent; | 498 | struct dentry *parent; |
| 499 | int ret; | 499 | int ret; |
| 500 | 500 | ||
| 501 | if (!dentry) | 501 | if (IS_ERR_OR_NULL(dentry)) |
| 502 | return; | 502 | return; |
| 503 | 503 | ||
| 504 | parent = dentry->d_parent; | 504 | parent = dentry->d_parent; |
| @@ -530,7 +530,7 @@ void debugfs_remove_recursive(struct dentry *dentry) | |||
| 530 | struct dentry *child; | 530 | struct dentry *child; |
| 531 | struct dentry *parent; | 531 | struct dentry *parent; |
| 532 | 532 | ||
| 533 | if (!dentry) | 533 | if (IS_ERR_OR_NULL(dentry)) |
| 534 | return; | 534 | return; |
| 535 | 535 | ||
| 536 | parent = dentry->d_parent; | 536 | parent = dentry->d_parent; |
