Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

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)
         if (down_trylock(&unix_gc_sem))
                 return;
 
-        read_lock(&unix_table_lock);
+        spin_lock(&unix_table_lock);
 
         forall_unix_sockets(i, s)
         {
@@ -301,7 +301,7 @@ void unix_gc(void)
                 }
                 u->gc_tree = GC_ORPHAN;
         }
-        read_unlock(&unix_table_lock);
+        spin_unlock(&unix_table_lock);
 
         /*
          *      Here we are. Hitlist is filled. Die.