diff options
author | Stefan Hajnoczi <stefanha@redhat.com> | 2015-12-02 01:17:52 -0500 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-12-28 09:57:15 -0500 |
commit | d1358917f2eb530bc6a097937302282a428806f8 (patch) | |
tree | 8846b469036650c142c21b6ddb02e0a11d0ea3ca /net/sunrpc | |
parent | 99ade3c71b1e40e7174d6527709399a87f3d05e0 (diff) |
SUNRPC: drop unused xs_reclassify_socketX() helpers
xs_reclassify_socket4() and friends used to be called directly.
xs_reclassify_socket() is called instead nowadays.
The xs_reclassify_socketX() helper functions are empty when
CONFIG_DEBUG_LOCK_ALLOC is not defined. Drop them since they have no
callers.
Note that AF_LOCAL still calls xs_reclassify_socketu() directly but is
easily converted to generic xs_reclassify_socket().
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/xprtsock.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 2ffaf6a79499..70c13d675dc1 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -1907,18 +1907,6 @@ static inline void xs_reclassify_socket(int family, struct socket *sock) | |||
1907 | } | 1907 | } |
1908 | } | 1908 | } |
1909 | #else | 1909 | #else |
1910 | static inline void xs_reclassify_socketu(struct socket *sock) | ||
1911 | { | ||
1912 | } | ||
1913 | |||
1914 | static inline void xs_reclassify_socket4(struct socket *sock) | ||
1915 | { | ||
1916 | } | ||
1917 | |||
1918 | static inline void xs_reclassify_socket6(struct socket *sock) | ||
1919 | { | ||
1920 | } | ||
1921 | |||
1922 | static inline void xs_reclassify_socket(int family, struct socket *sock) | 1910 | static inline void xs_reclassify_socket(int family, struct socket *sock) |
1923 | { | 1911 | { |
1924 | } | 1912 | } |
@@ -2008,7 +1996,7 @@ static int xs_local_setup_socket(struct sock_xprt *transport) | |||
2008 | "transport socket (%d).\n", -status); | 1996 | "transport socket (%d).\n", -status); |
2009 | goto out; | 1997 | goto out; |
2010 | } | 1998 | } |
2011 | xs_reclassify_socketu(sock); | 1999 | xs_reclassify_socket(AF_LOCAL, sock); |
2012 | 2000 | ||
2013 | dprintk("RPC: worker connecting xprt %p via AF_LOCAL to %s\n", | 2001 | dprintk("RPC: worker connecting xprt %p via AF_LOCAL to %s\n", |
2014 | xprt, xprt->address_strings[RPC_DISPLAY_ADDR]); | 2002 | xprt, xprt->address_strings[RPC_DISPLAY_ADDR]); |