Commit 087739d4 authored by Pavel Emelyanov's avatar Pavel Emelyanov

rst: Remove xid_fail

It was required as a temp stub for MySQL restore. Now it
just spoils the code.
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 25af1bee
...@@ -899,16 +899,6 @@ err: ...@@ -899,16 +899,6 @@ err:
futex_abort_and_wake(&task_entries->nr_in_progress); futex_abort_and_wake(&task_entries->nr_in_progress);
} }
/*
* FIXME Din't fail on xid restore failure. MySQL uses runaway
* pgid and sid and there's nothing we can do about it yet :(
*/
static void xid_fail(void)
{
exit(1);
}
static void restore_sid(void) static void restore_sid(void)
{ {
pid_t sid; pid_t sid;
...@@ -927,7 +917,7 @@ static void restore_sid(void) ...@@ -927,7 +917,7 @@ static void restore_sid(void)
sid = setsid(); sid = setsid();
if (sid != current->sid) { if (sid != current->sid) {
pr_perror("Can't restore sid (%d)", sid); pr_perror("Can't restore sid (%d)", sid);
xid_fail(); exit(1);
} }
} else { } else {
sid = getsid(getpid()); sid = getsid(getpid());
...@@ -937,7 +927,7 @@ static void restore_sid(void) ...@@ -937,7 +927,7 @@ static void restore_sid(void)
return; return;
pr_err("Requested sid %d doesn't match inherited %d\n", pr_err("Requested sid %d doesn't match inherited %d\n",
current->sid, sid); current->sid, sid);
xid_fail(); exit(1);
} }
} }
} }
...@@ -955,7 +945,7 @@ static void restore_pgid(void) ...@@ -955,7 +945,7 @@ static void restore_pgid(void)
pr_info("\twill call setpgid, mine pgid is %d\n", pgid); pr_info("\twill call setpgid, mine pgid is %d\n", pgid);
if (setpgid(0, current->pgid) != 0) { if (setpgid(0, current->pgid) != 0) {
pr_perror("Can't restore pgid (%d/%d->%d)", current->pid.virt, pgid, current->pgid); pr_perror("Can't restore pgid (%d/%d->%d)", current->pid.virt, pgid, current->pgid);
xid_fail(); exit(1);
} }
} }
......
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