From 36d801e124341872b82f7dd32dfa252afe72d055 Mon Sep 17 00:00:00 2001 From: Vlad Yasevich Date: Wed, 28 Apr 2010 08:47:20 +0000 Subject: [PATCH] --- yaml --- r: 190371 b: refs/heads/master c: 81419d862db743fe4450a021893f24bab4698c1d h: refs/heads/master i: 190369: 2a734ae27d1522285835a0af9877fcb40de03fa2 190367: fd8564b001858d45badd440280205ffa44de85b0 v: v3 --- [refs] | 2 +- trunk/net/sctp/socket.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 315e9cb0dd8f..d134db7dea8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c42749cffbb4a06be86c5e5db6c7ebad548781f +refs/heads/master: 81419d862db743fe4450a021893f24bab4698c1d diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index efa2bc3f0028..44a1ab03a3f0 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -3719,12 +3719,12 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk) sp->hmac = NULL; SCTP_DBG_OBJCNT_INC(sock); - percpu_counter_inc(&sctp_sockets_allocated); /* Set socket backlog limit. */ sk->sk_backlog.limit = sysctl_sctp_rmem[1]; local_bh_disable(); + percpu_counter_inc(&sctp_sockets_allocated); sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); local_bh_enable(); @@ -3741,8 +3741,8 @@ SCTP_STATIC void sctp_destroy_sock(struct sock *sk) /* Release our hold on the endpoint. */ ep = sctp_sk(sk)->ep; sctp_endpoint_free(ep); - percpu_counter_dec(&sctp_sockets_allocated); local_bh_disable(); + percpu_counter_dec(&sctp_sockets_allocated); sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); local_bh_enable(); }