Skip to content

Commit

Permalink
SUNRPC: drop unused xs_reclassify_socketX() helpers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stefan Hajnoczi authored and Trond Myklebust committed Dec 28, 2015
1 parent 99ade3c commit d135891
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions net/sunrpc/xprtsock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1907,18 +1907,6 @@ static inline void xs_reclassify_socket(int family, struct socket *sock)
}
}
#else
static inline void xs_reclassify_socketu(struct socket *sock)
{
}

static inline void xs_reclassify_socket4(struct socket *sock)
{
}

static inline void xs_reclassify_socket6(struct socket *sock)
{
}

static inline void xs_reclassify_socket(int family, struct socket *sock)
{
}
Expand Down Expand Up @@ -2008,7 +1996,7 @@ static int xs_local_setup_socket(struct sock_xprt *transport)
"transport socket (%d).\n", -status);
goto out;
}
xs_reclassify_socketu(sock);
xs_reclassify_socket(AF_LOCAL, sock);

dprintk("RPC: worker connecting xprt %p via AF_LOCAL to %s\n",
xprt, xprt->address_strings[RPC_DISPLAY_ADDR]);
Expand Down

0 comments on commit d135891

Please sign in to comment.