Merge tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / fs / debugfs / inode.c

diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index d17c20f..4733eab 100644 (file)
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -495,7 +495,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;
@@ -527,7 +527,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;