[PATCH 3.12 082/123] af_unix: Convert the unix_sk macro to an inline function for type safety

From: Jiri Slaby
Date: Wed Oct 28 2015 - 10:10:12 EST

From: Aaron Conole <aconole@xxxxxxxxxx>

3.12-stable review patch. If anyone has any objections, please let me know.


[ Upstream commit 4613012db1d911f80897f9446a49de817b2c4c47 ]

As suggested by Eric Dumazet this change replaces the
#define with a static inline function to enjoy
complaints by the compiler when misusing the API.

Signed-off-by: Aaron Conole <aconole@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
include/net/af_unix.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index a175ba4a7adb..dfe4ddfbb43c 100644
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -64,7 +64,11 @@ struct unix_sock {
struct socket_wq peer_wq;
-#define unix_sk(__sk) ((struct unix_sock *)__sk)
+static inline struct unix_sock *unix_sk(struct sock *sk)
+ return (struct unix_sock *)sk;

#define peer_wait peer_wq.wait


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/