From 8d636f4a50c5463261ae7eff551cd94a16e5bf16 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sat, 4 Apr 2009 16:41:09 -0700 Subject: [PATCH] --- yaml --- r: 142369 b: refs/heads/master c: 4e69489a0ac11a9b62a25923975bfc370a30eae5 h: refs/heads/master i: 142367: e34a592ea6e8f25e4c7a6002b4eab4d1e1ebbce7 v: v3 --- [refs] | 2 +- trunk/net/socket.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 776c2bad518e..6d2621d04983 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62994b2d6beb5f7c59a25bf77e01f191acf74ea2 +refs/heads/master: 4e69489a0ac11a9b62a25923975bfc370a30eae5 diff --git a/trunk/net/socket.c b/trunk/net/socket.c index 0b14b79c03af..7d5ebc0eb69e 100644 --- a/trunk/net/socket.c +++ b/trunk/net/socket.c @@ -493,8 +493,7 @@ static struct socket *sock_alloc(void) inode->i_uid = current_fsuid(); inode->i_gid = current_fsgid(); - get_cpu_var(sockets_in_use)++; - put_cpu_var(sockets_in_use); + percpu_add(sockets_in_use, 1); return sock; } @@ -536,8 +535,7 @@ void sock_release(struct socket *sock) if (sock->fasync_list) printk(KERN_ERR "sock_release: fasync list not empty!\n"); - get_cpu_var(sockets_in_use)--; - put_cpu_var(sockets_in_use); + percpu_sub(sockets_in_use, 1); if (!sock->file) { iput(SOCK_INODE(sock)); return;