net: convert sk_buff.users from atomic_t to refcount_t

[mirror_ubuntu-artful-kernel.git] / net / sctp / proc.c

diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index a0b29d43627f48425e83d7d3c9698d99315dd869..8e34db56bc1db2a118722b5d88ab5e3f757f2fca 100644 (file)
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -218,8 +218,7 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v)
                return -ENOMEM;
 
        head = &sctp_ep_hashtable[hash];
-       local_bh_disable();
-       read_lock(&head->lock);
+       read_lock_bh(&head->lock);
        sctp_for_each_hentry(epb, &head->chain) {
                ep = sctp_ep(epb);
                sk = epb->sk;
@@ -234,8 +233,7 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v)
                sctp_seq_dump_local_addrs(seq, epb);
                seq_printf(seq, "\n");
        }
-       read_unlock(&head->lock);
-       local_bh_enable();
+       read_unlock_bh(&head->lock);
 
        return 0;
 }
@@ -361,8 +359,8 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
        sctp_seq_dump_remote_addrs(seq, assoc);
        seq_printf(seq, "\t%8lu %5d %5d %4d %4d %4d %8d "
                   "%8d %8d %8d %8d",
-               assoc->hbinterval, assoc->stream->incnt,
-               assoc->stream->outcnt, assoc->max_retrans,
+               assoc->hbinterval, assoc->stream.incnt,
+               assoc->stream.outcnt, assoc->max_retrans,
                assoc->init_retries, assoc->shutdown_retries,
                assoc->rtx_data_chunks,
                atomic_read(&sk->sk_wmem_alloc),