diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-11-10 22:06:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-11-10 22:06:01 -0800 |
| commit | 9305cfa4443dbfb99faf35c5603ec0c0e91b5ef8 (patch) | |
| tree | 957551b7016caedcb6f85ec733e6a14d6707096f | |
| parent | 8032b46489e50ef8f3992159abd0349b5b8e476c (diff) | |
| download | linux-3.10-9305cfa4443dbfb99faf35c5603ec0c0e91b5ef8.tar.gz linux-3.10-9305cfa4443dbfb99faf35c5603ec0c0e91b5ef8.tar.bz2 linux-3.10-9305cfa4443dbfb99faf35c5603ec0c0e91b5ef8.zip | |
[AF_UNIX]: Make unix_tot_inflight counter non-atomic
This counter is _always_ modified under the unix_gc_lock spinlock,
so its atomicity can be provided w/o additional efforts.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/af_unix.h | 2 | ||||
| -rw-r--r-- | net/unix/af_unix.c | 2 | ||||
| -rw-r--r-- | net/unix/garbage.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 0864a775de2..a1c805d7f48 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -12,7 +12,7 @@ extern void unix_gc(void); #define UNIX_HASH_SIZE 256 -extern atomic_t unix_tot_inflight; +extern unsigned int unix_tot_inflight; struct unix_address { atomic_t refcnt; diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 515e7a692f9..ab9048ac197 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -457,7 +457,7 @@ static int unix_release_sock (struct sock *sk, int embrion) * What the above comment does talk about? --ANK(980817) */ - if (atomic_read(&unix_tot_inflight)) + if (unix_tot_inflight) unix_gc(); /* Garbage collect fds */ return 0; diff --git a/net/unix/garbage.c b/net/unix/garbage.c index 406b6433e46..399717ed7b9 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c @@ -92,7 +92,7 @@ static LIST_HEAD(gc_inflight_list); static LIST_HEAD(gc_candidates); static DEFINE_SPINLOCK(unix_gc_lock); -atomic_t unix_tot_inflight = ATOMIC_INIT(0); +unsigned int unix_tot_inflight; static struct sock *unix_get_socket(struct file *filp) @@ -133,7 +133,7 @@ void unix_inflight(struct file *fp) } else { BUG_ON(list_empty(&u->link)); } - atomic_inc(&unix_tot_inflight); + unix_tot_inflight++; spin_unlock(&unix_gc_lock); } } @@ -147,7 +147,7 @@ void unix_notinflight(struct file *fp) BUG_ON(list_empty(&u->link)); if (atomic_dec_and_test(&u->inflight)) list_del_init(&u->link); - atomic_dec(&unix_tot_inflight); + unix_tot_inflight--; spin_unlock(&unix_gc_lock); } } |