[PATCH 38/45] C++: mutex_trylock_recursive_enum() int->enum

David Howells
2018-04-01T20:44:09Z

Make mutex_trylock_recursive_enum() cast the int it derives to the enum
return type.

Signed-off-by: David Howells <dhowells@redhat.com>
---

include/linux/mutex.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index cb3bbed4e633..2bacc5065980 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -224,13 +224,14 @@ enum mutex_trylock_recursive_enum {
* - MUTEX_TRYLOCK_SUCCESS - lock acquired,
* - MUTEX_TRYLOCK_RECURSIVE - we already owned the lock.
*/
-static inline /* __deprecated */ __must_check enum mutex_trylock_recursive_enum
+static inline /* __deprecated */ __must_check
+enum mutex_trylock_recursive_enum
mutex_trylock_recursive(struct mutex *lock)
{
if (unlikely(__mutex_owner(lock) == current))
return MUTEX_TRYLOCK_RECURSIVE;

- return mutex_trylock(lock);
+ return (enum mutex_trylock_recursive_enum)mutex_trylock(lock);
}

#endif /* __LINUX_MUTEX_H */