aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/err.h
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-04-03 17:48:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 19:21:06 -0400
commita5ed3cee944abf2c80ae146b06f9055d7da03f94 (patch)
tree49563f9cce54bd9a6f25aab4f4595feb4c92625b /include/linux/err.h
parent8e3072a23ff8cf69b3e654a7cd64eae04f06a0e6 (diff)
err.h: use bool for IS_ERR and IS_ERR_OR_NULL
Use the more natural return of bool for these tests. No difference observed in .o files produced by gcc for x86. Remove the dentry description of kernel pointers left over from the 90's and 2002's cleanup move of parts of fs.h to err.h. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/err.h')
-rw-r--r--include/linux/err.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/err.h b/include/linux/err.h
index 15f92e072450..a729120644d5 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -2,12 +2,13 @@
2#define _LINUX_ERR_H 2#define _LINUX_ERR_H
3 3
4#include <linux/compiler.h> 4#include <linux/compiler.h>
5#include <linux/types.h>
5 6
6#include <asm/errno.h> 7#include <asm/errno.h>
7 8
8/* 9/*
9 * Kernel pointers have redundant information, so we can use a 10 * Kernel pointers have redundant information, so we can use a
10 * scheme where we can return either an error code or a dentry 11 * scheme where we can return either an error code or a normal
11 * pointer with the same return value. 12 * pointer with the same return value.
12 * 13 *
13 * This should be a per-architecture thing, to allow different 14 * This should be a per-architecture thing, to allow different
@@ -29,12 +30,12 @@ static inline long __must_check PTR_ERR(__force const void *ptr)
29 return (long) ptr; 30 return (long) ptr;
30} 31}
31 32
32static inline long __must_check IS_ERR(__force const void *ptr) 33static inline bool __must_check IS_ERR(__force const void *ptr)
33{ 34{
34 return IS_ERR_VALUE((unsigned long)ptr); 35 return IS_ERR_VALUE((unsigned long)ptr);
35} 36}
36 37
37static inline long __must_check IS_ERR_OR_NULL(__force const void *ptr) 38static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
38{ 39{
39 return !ptr || IS_ERR_VALUE((unsigned long)ptr); 40 return !ptr || IS_ERR_VALUE((unsigned long)ptr);
40} 41}