From: Arend van Spriel Date: Wed, 23 May 2012 13:13:07 +0000 (+0200) Subject: debugfs: change parameter check in debugfs_remove() functions X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~14374^2~14^2~16 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a59d6293e5372d7c35212932e083e2a541151eff;p=mirror_ubuntu-artful-kernel.git 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 Signed-off-by: Greg Kroah-Hartman --- 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) struct dentry *parent; int ret; - if (!dentry) + if (IS_ERR_OR_NULL(dentry)) return; parent = dentry->d_parent; @@ -530,7 +530,7 @@ void debugfs_remove_recursive(struct dentry *dentry) struct dentry *child; struct dentry *parent; - if (!dentry) + if (IS_ERR_OR_NULL(dentry)) return; parent = dentry->d_parent;