diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-15 15:15:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 15:15:17 -0700 |
| commit | c337ffb68e1e71bad069b14d2246fa1e0c31699c (patch) | |
| tree | 7861a59b196adfd63758cc0921e4fb56030fbaf3 /net/unix | |
| parent | 30df754dedebf27ef90452944a723ba058d23396 (diff) | |
| parent | 84c0c6933cb0303fa006992a6659c2b46de4eb17 (diff) | |
| download | kernel_samsung_smdk4412-c337ffb68e1e71bad069b14d2246fa1e0c31699c.zip kernel_samsung_smdk4412-c337ffb68e1e71bad069b14d2246fa1e0c31699c.tar.gz kernel_samsung_smdk4412-c337ffb68e1e71bad069b14d2246fa1e0c31699c.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index de87018..ef70615 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1124,7 +1124,7 @@ restart: /* Latch our state. - It is tricky place. We need to grab write lock and cannot + It is tricky place. We need to grab our state lock and cannot drop lock on peer. It is dangerous because deadlock is possible. Connect to self case and simultaneous attempt to connect are eliminated by checking socket |