2008-10-17 11:14:18

by Zhao Lei

Subject: [PATCH] Fix debugfs_create_*'s error checking method for mips/kernel/

Hi,

debugfs_create_*() returns NULL if an error occurs, returns -ENODEV
when debugfs is not enabled in the kernel.

Signed-off-by: Zhao Lei <[email protected]>
---
arch/mips/kernel/setup.c | 4 ++--
arch/mips/kernel/unaligned.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 16f8edf..4430a1f 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -601,8 +601,8 @@ static int __init debugfs_mips(void)
struct dentry *d;

d = debugfs_create_dir("mips", NULL);
- if (IS_ERR(d))
- return PTR_ERR(d);
+ if (!d)
+ return -ENOMEM;
mips_debugfs_dir = d;
return 0;
}
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index c327b21..2070966 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -560,12 +560,12 @@ static int __init debugfs_unaligned(void)
return -ENODEV;
d = debugfs_create_u32("unaligned_instructions", S_IRUGO,
mips_debugfs_dir, &unaligned_instructions);
- if (IS_ERR(d))
- return PTR_ERR(d);
+ if (!d)
+ return -ENOMEM;
d = debugfs_create_u32("unaligned_action", S_IRUGO | S_IWUSR,
mips_debugfs_dir, &unaligned_action);
- if (IS_ERR(d))
- return PTR_ERR(d);
+ if (!d)
+ return -ENOMEM;
return 0;
}
__initcall(debugfs_unaligned);
--
1.5.5.3

2008-10-17 14:37:17

by Atsushi Nemoto

Subject: Re: [PATCH] Fix debugfs_create_*'s error checking method for mips/kernel/

On Fri, 17 Oct 2008 19:12:35 +0800, Zhaolei <[email protected]> wrote:
> debugfs_create_*() returns NULL if an error occurs, returns -ENODEV
> when debugfs is not enabled in the kernel.
>
> Signed-off-by: Zhao Lei <[email protected]>

Oh that was my fault. Thank you for fixing it.

Acked-by: Atsushi Nemoto <[email protected]>

2008-10-17 15:12:24

by Ralf Baechle

Subject: Re: [PATCH] Fix debugfs_create_*'s error checking method for mips/kernel/

On Fri, Oct 17, 2008 at 07:12:35PM +0800, Zhaolei wrote:

> debugfs_create_*() returns NULL if an error occurs, returns -ENODEV
> when debugfs is not enabled in the kernel.

Applied. Thanks,

Ralf