Commit 095ae612 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

tipc: call tsk_set_importance from tipc_topsrv_create_listener 



Avoid using kernel_setsockopt for the TIPC_IMPORTANCE option when we can
just use the internal helper.  The only change needed is to pass a struct
sock instead of tipc_sock, which is private to socket.c

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 298cd88a

net/tipc/socket.c

+9 −9
Original line number Diff line number Diff line
@@ -196,17 +196,17 @@ static int tsk_importance(struct tipc_sock *tsk) 
	return msg_importance(&tsk->phdr);

}



static int tsk_set_importance(struct tipc_sock *tsk, int imp)

static struct tipc_sock *tipc_sk(const struct sock *sk)

{

	if (imp > TIPC_CRITICAL_IMPORTANCE)

		return -EINVAL;

	msg_set_importance(&tsk->phdr, (u32)imp);

	return 0;

	return container_of(sk, struct tipc_sock, sk);

}



static struct tipc_sock *tipc_sk(const struct sock *sk)

int tsk_set_importance(struct sock *sk, int imp)

{

	return container_of(sk, struct tipc_sock, sk);

	if (imp > TIPC_CRITICAL_IMPORTANCE)

		return -EINVAL;

	msg_set_importance(&tipc_sk(sk)->phdr, (u32)imp);

	return 0;

}



static bool tsk_conn_cong(struct tipc_sock *tsk)
@@ -2721,7 +2721,7 @@ static int tipc_accept(struct socket *sock, struct socket *new_sock, int flags, 
	/* Connect new socket to it's peer */

	tipc_sk_finish_conn(new_tsock, msg_origport(msg), msg_orignode(msg));



	tsk_set_importance(new_tsock, msg_importance(msg));

	tsk_set_importance(new_sk, msg_importance(msg));

	if (msg_named(msg)) {

		new_tsock->conn_type = msg_nametype(msg);

		new_tsock->conn_instance = msg_nameinst(msg);
@@ -3139,7 +3139,7 @@ static int tipc_setsockopt(struct socket *sock, int lvl, int opt, 


	switch (opt) {

	case TIPC_IMPORTANCE:

		res = tsk_set_importance(tsk, value);

		res = tsk_set_importance(sk, value);

		break;

	case TIPC_SRC_DROPPABLE:

		if (sock->type != SOCK_STREAM)

net/tipc/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -75,4 +75,6 @@ u32 tipc_sock_get_portid(struct sock *sk); 
bool tipc_sk_overlimit1(struct sock *sk, struct sk_buff *skb);

bool tipc_sk_overlimit2(struct sock *sk, struct sk_buff *skb);



int tsk_set_importance(struct sock *sk, int imp);



#endif

net/tipc/topsrv.c

+3 −3
Original line number Diff line number Diff line
@@ -497,7 +497,6 @@ static void tipc_topsrv_listener_data_ready(struct sock *sk) 


static int tipc_topsrv_create_listener(struct tipc_topsrv *srv)

{

	int imp = TIPC_CRITICAL_IMPORTANCE;

	struct socket *lsock = NULL;

	struct sockaddr_tipc saddr;

	struct sock *sk;
@@ -514,8 +513,9 @@ static int tipc_topsrv_create_listener(struct tipc_topsrv *srv) 
	sk->sk_user_data = srv;

	write_unlock_bh(&sk->sk_callback_lock);



	rc = kernel_setsockopt(lsock, SOL_TIPC, TIPC_IMPORTANCE,

			       (char *)&imp, sizeof(imp));

	lock_sock(sk);

	rc = tsk_set_importance(sk, TIPC_CRITICAL_IMPORTANCE);

	release_sock(sk);

	if (rc < 0)

		goto err;