p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'sctp-cleanups' 

Xin Long says:

====================
sctp: some cleanups for sctp

There are some unused function and redundant rcu locks should be
removed.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2016-02-17 15:41:55 -05:00
parent bd4508e850 1cd4d5c432
commit 7530e44c54
4 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/sctp/structs.h
View File

@ -535,7 +535,6 @@ struct sctp_datamsg {
struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *, struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *,
struct sctp_sndrcvinfo *, struct sctp_sndrcvinfo *,
struct iov_iter *); struct iov_iter *);
void sctp_datamsg_free(struct sctp_datamsg *);
void sctp_datamsg_put(struct sctp_datamsg *); void sctp_datamsg_put(struct sctp_datamsg *);
void sctp_chunk_fail(struct sctp_chunk *, int error); void sctp_chunk_fail(struct sctp_chunk *, int error);
int sctp_chunk_abandoned(struct sctp_chunk *); int sctp_chunk_abandoned(struct sctp_chunk *);

13
net/sctp/chunk.c
View File

@ -70,19 +70,6 @@ static struct sctp_datamsg *sctp_datamsg_new(gfp_t gfp)
return msg; return msg;
} }
void sctp_datamsg_free(struct sctp_datamsg *msg)
{
struct sctp_chunk *chunk;
/* This doesn't have to be a _safe vairant because
* sctp_chunk_free() only drops the refs.
*/
list_for_each_entry(chunk, &msg->chunks, frag_list)
sctp_chunk_free(chunk);
sctp_datamsg_put(msg);
}
/* Final destructruction of datamsg memory. */ /* Final destructruction of datamsg memory. */
static void sctp_datamsg_destroy(struct sctp_datamsg *msg) static void sctp_datamsg_destroy(struct sctp_datamsg *msg)
{ {

4
net/sctp/input.c
View File

@ -937,7 +937,6 @@ static struct sctp_association *__sctp_lookup_association(
struct sctp_transport *t; struct sctp_transport *t;
struct sctp_association *asoc = NULL; struct sctp_association *asoc = NULL;
rcu_read_lock();
t = sctp_addrs_lookup_transport(net, local, peer); t = sctp_addrs_lookup_transport(net, local, peer);
if (!t || !sctp_transport_hold(t)) if (!t || !sctp_transport_hold(t))
goto out; goto out;
@ -949,7 +948,6 @@ static struct sctp_association *__sctp_lookup_association(
sctp_transport_put(t); sctp_transport_put(t);
out: out:
rcu_read_unlock();
return asoc; return asoc;
} }
@ -962,7 +960,9 @@ struct sctp_association *sctp_lookup_association(struct net *net,
{ {
struct sctp_association *asoc; struct sctp_association *asoc;
rcu_read_lock();
asoc = __sctp_lookup_association(net, laddr, paddr, transportp); asoc = __sctp_lookup_association(net, laddr, paddr, transportp);
rcu_read_unlock();
return asoc; return asoc;
} }

2
net/sctp/proc.c
View File

@ -161,7 +161,6 @@ static void sctp_seq_dump_remote_addrs(struct seq_file *seq, struct sctp_associa
struct sctp_af *af; struct sctp_af *af;
primary = &assoc->peer.primary_addr; primary = &assoc->peer.primary_addr;
rcu_read_lock();
list_for_each_entry_rcu(transport, &assoc->peer.transport_addr_list, list_for_each_entry_rcu(transport, &assoc->peer.transport_addr_list,
transports) { transports) {
addr = &transport->ipaddr; addr = &transport->ipaddr;
@ -172,7 +171,6 @@ static void sctp_seq_dump_remote_addrs(struct seq_file *seq, struct sctp_associa
} }
af->seq_dump_addr(seq, addr); af->seq_dump_addr(seq, addr);
} }
rcu_read_unlock();
} }
static void *sctp_eps_seq_start(struct seq_file *seq, loff_t *pos) static void *sctp_eps_seq_start(struct seq_file *seq, loff_t *pos)