]> git.karo-electronics.de Git - linux-beck.git/commitdiff
debugfs: change parameter check in debugfs_remove() functions
authorArend van Spriel <arend@broadcom.com>
Wed, 23 May 2012 13:13:07 +0000 (15:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Jun 2012 23:40:41 +0000 (16:40 -0700)
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>
fs/debugfs/inode.c

index b80bc846a15a55d6e8f4fefa2ad2231713616f45..0de5e26870c36685a062b3432cfdab7dd23d1c70 100644 (file)
@@ -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;