summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Conole <aconole@bytheb.org>2015-09-26 18:50:42 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-27 09:51:52 +0900
commita96cb1c6030aa565bcf15e0b03dee3ca5bb1d05a (patch)
treef3c6476e6898d3c9b309287aba240709972eea80
parente962218b42896856642f8d37bb69c4f1feaa8ad9 (diff)
af_unix: Convert the unix_sk macro to an inline function for type safety
[ 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@bytheb.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/net/af_unix.h6
1 files changed, 5 insertions, 1 deletions
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 {
#define UNIX_GC_MAYBE_CYCLE 1
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