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

Commit 80445cfb authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

[SCTP]: Remove redundant wrapper functions. 



sctp_datamsg_free and sctp_datamsg_track are just aliases for
sctp_datamsg_put and sctp_chunk_hold, respectively.

Saves 32 Bytes on x86.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2444844c

include/net/sctp/structs.h

+0 −2
Original line number Diff line number Diff line
@@ -637,8 +637,6 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *, 
					    struct sctp_sndrcvinfo *,

					    struct msghdr *, int len);

void sctp_datamsg_put(struct sctp_datamsg *);

void sctp_datamsg_free(struct sctp_datamsg *);

void sctp_datamsg_track(struct sctp_chunk *);

void sctp_chunk_fail(struct sctp_chunk *, int error);

int sctp_chunk_abandoned(struct sctp_chunk *);

net/sctp/chunk.c

+1 −15
Original line number Diff line number Diff line
@@ -136,20 +136,6 @@ void sctp_datamsg_put(struct sctp_datamsg *msg) 
		sctp_datamsg_destroy(msg);

}



/* Free a message.  Really just give up a reference, the

 * really free happens in sctp_datamsg_destroy().

 */

void sctp_datamsg_free(struct sctp_datamsg *msg)

{

	sctp_datamsg_put(msg);

}



/* Hold on to all the fragments until all chunks have been sent. */

void sctp_datamsg_track(struct sctp_chunk *chunk)

{

	sctp_chunk_hold(chunk);

}



/* Assign a chunk to this datamsg. */

static void sctp_datamsg_assign(struct sctp_datamsg *msg, struct sctp_chunk *chunk)

{
@@ -295,7 +281,7 @@ errout: 
		chunk = list_entry(pos, struct sctp_chunk, frag_list);

		sctp_chunk_free(chunk);

	}

	sctp_datamsg_free(msg);

	sctp_datamsg_put(msg);

	return NULL;

}

net/sctp/socket.c

+2 −2
Original line number Diff line number Diff line
@@ -1729,7 +1729,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk, 
	/* Now send the (possibly) fragmented message. */

	list_for_each(pos, &datamsg->chunks) {

		chunk = list_entry(pos, struct sctp_chunk, frag_list);

		sctp_datamsg_track(chunk);

		sctp_chunk_hold(chunk);



		/* Do accounting for the write space.  */

		sctp_set_owner_w(chunk);
@@ -1748,7 +1748,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk, 
		SCTP_DEBUG_PRINTK("We sent primitively.\n");

	}



	sctp_datamsg_free(datamsg);

	sctp_datamsg_put(datamsg);

	if (err)

		goto out_free;

	else