You need to sign in or sign up before continuing.
提交 6e8b8726 编写于 作者: R Rusty Russell

PTR_RET is now PTR_ERR_OR_ZERO

True, it's often used in return statements, but after much bikeshedding
it's probably better to have an explicit name.

(I tried just putting the IS_ERR check inside PTR_ERR itself and gcc
usually generated no more code.  But that clashes current expectations
of how PTR_ERR behaves, so having a separate function is better).
Suggested-by: NJulia Lawall <julia.lawall@lip6.fr>
Suggested-by: N"Michael S. Tsirkin" <mst@redhat.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
上级 ad81f054
...@@ -52,7 +52,7 @@ static inline void * __must_check ERR_CAST(__force const void *ptr) ...@@ -52,7 +52,7 @@ static inline void * __must_check ERR_CAST(__force const void *ptr)
return (void *) ptr; return (void *) ptr;
} }
static inline int __must_check PTR_RET(__force const void *ptr) static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr)
{ {
if (IS_ERR(ptr)) if (IS_ERR(ptr))
return PTR_ERR(ptr); return PTR_ERR(ptr);
...@@ -60,6 +60,9 @@ static inline int __must_check PTR_RET(__force const void *ptr) ...@@ -60,6 +60,9 @@ static inline int __must_check PTR_RET(__force const void *ptr)
return 0; return 0;
} }
/* Deprecated */
#define PTR_RET(p) PTR_ERR_OR_ZERO(p)
#endif #endif
#endif /* _LINUX_ERR_H */ #endif /* _LINUX_ERR_H */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册