diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
| commit | 0a0fc0ddbe732779366ab6b1b879f62195e65967 (patch) | |
| tree | 7b42490a676cf39ae0691b6859ecf7fd410f229b /net/unix/garbage.c | |
| parent | 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a (diff) | |
| parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'net/unix/garbage.c')
| -rw-r--r-- | net/unix/garbage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index 6ffc64e1712d..411802bd4d37 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c | |||
| @@ -182,7 +182,7 @@ void unix_gc(void) | |||
| 182 | if (down_trylock(&unix_gc_sem)) | 182 | if (down_trylock(&unix_gc_sem)) |
| 183 | return; | 183 | return; |
| 184 | 184 | ||
| 185 | read_lock(&unix_table_lock); | 185 | spin_lock(&unix_table_lock); |
| 186 | 186 | ||
| 187 | forall_unix_sockets(i, s) | 187 | forall_unix_sockets(i, s) |
| 188 | { | 188 | { |
| @@ -301,7 +301,7 @@ void unix_gc(void) | |||
| 301 | } | 301 | } |
| 302 | u->gc_tree = GC_ORPHAN; | 302 | u->gc_tree = GC_ORPHAN; |
| 303 | } | 303 | } |
| 304 | read_unlock(&unix_table_lock); | 304 | spin_unlock(&unix_table_lock); |
| 305 | 305 | ||
| 306 | /* | 306 | /* |
| 307 | * Here we are. Hitlist is filled. Die. | 307 | * Here we are. Hitlist is filled. Die. |