diff options
| author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2010-04-28 08:47:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-28 12:16:33 -0700 |
| commit | 81419d862db743fe4450a021893f24bab4698c1d (patch) | |
| tree | 01e1624bc38ba93dcc365c4c09e6235fb95c7c9b | |
| parent | 0c42749cffbb4a06be86c5e5db6c7ebad548781f (diff) | |
| download | blackbird-op-linux-81419d862db743fe4450a021893f24bab4698c1d.tar.gz blackbird-op-linux-81419d862db743fe4450a021893f24bab4698c1d.zip | |
sctp: per_cpu variables should be in bh_disabled section
Since the change of the atomics to percpu variables, we now
have to disable BH in process context when touching percpu variables.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sctp/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index efa2bc3f0028..44a1ab03a3f0 100644 --- a/net/sctp/socket.c +++ b/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(); } |
