Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1358917 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Trond Myklebust
Browse files

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: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 99ade3c7

net/sunrpc/xprtsock.c

+1 −13
Original line number Diff line number Diff line
@@ -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)

{

}
@@ -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]);