Commit 62f4275d authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Andrei Vagin

unix: Shift code right (cont)

This is the continuation of the previous patch.
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 01e9542f
...@@ -1464,37 +1464,32 @@ static int resolve_unix_peer(struct pprep_head *ph) ...@@ -1464,37 +1464,32 @@ static int resolve_unix_peer(struct pprep_head *ph)
struct unix_sk_info *ui, *peer; struct unix_sk_info *ui, *peer;
ui = container_of(ph, struct unix_sk_info, peer_resolve); ui = container_of(ph, struct unix_sk_info, peer_resolve);
if (ui->peer)
goto out;
{ BUG_ON(!ui->ue->peer);
if (ui->peer)
goto out;
BUG_ON(!ui->ue->peer);
peer = find_unix_sk_by_ino(ui->ue->peer);
if (!peer) {
pr_err("FATAL: Peer %#x unresolved for %#x\n",
ui->ue->peer, ui->ue->ino);
return -1;
}
set_peer(ui, peer); peer = find_unix_sk_by_ino(ui->ue->peer);
if (!peer->queuer) if (!peer) {
peer->queuer = ui->ue->ino; pr_err("FATAL: Peer %#x unresolved for %#x\n",
if (ui == peer) ui->ue->peer, ui->ue->ino);
/* socket connected to self %) */ return -1;
goto out;
if (peer->ue->peer != ui->ue->ino)
goto out;
pr_info("Connected %#x -> %#x (%#x) flags %#x\n",
ui->ue->ino, ui->ue->peer, peer->ue->ino, ui->flags);
set_peer(peer, ui);
/* socketpair or interconnected sockets */
interconnected_pair(ui, peer);
} }
set_peer(ui, peer);
if (!peer->queuer)
peer->queuer = ui->ue->ino;
if (ui == peer)
/* socket connected to self %) */
goto out;
if (peer->ue->peer != ui->ue->ino)
goto out;
pr_info("Connected %#x -> %#x (%#x) flags %#x\n",
ui->ue->ino, ui->ue->peer, peer->ue->ino, ui->flags);
set_peer(peer, ui);
/* socketpair or interconnected sockets */
interconnected_pair(ui, peer);
out: out:
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment