From de3553c881946c0c080dd97ad7c6bff4223144e7 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 14 Apr 2022 21:03:40 +0200 Subject: [PATCH] mxq_job: Remove unused parameter from mxq_unload_job_from_server --- mxq_job.c | 2 +- mxq_job.h | 2 +- mxqd.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mxq_job.c b/mxq_job.c index 08217fcb..0a02f3d9 100644 --- a/mxq_job.c +++ b/mxq_job.c @@ -803,7 +803,7 @@ int mxq_load_jobs_running_on_server(struct mx_mysql *mysql, struct mxq_job **job return res; } -int mxq_unload_job_from_server(struct mx_mysql *mysql, struct mxq_daemon *daemon, uint64_t job_id) { +int mxq_unload_job_from_server(struct mx_mysql *mysql, uint64_t job_id) { /* set a job from LOADED back to INQ. This needs to reset what * mxq_assign_job_from_group_to_daemon() and mxq_set_job_status_loaded_on_server() diff --git a/mxq_job.h b/mxq_job.h index f6a9c314..15699b65 100644 --- a/mxq_job.h +++ b/mxq_job.h @@ -93,5 +93,5 @@ int mxq_set_job_status_unknown(struct mx_mysql *mysql, struct mxq_job *job); int mxq_job_set_tmpfilenames(struct mxq_group *g, struct mxq_job *j); int mxq_load_job_from_group_for_daemon(struct mx_mysql *mysql, struct mxq_job *mxqjob, uint64_t group_id, struct mxq_daemon *daemon,unsigned long slots_per_job); int mxq_load_jobs_running_on_server(struct mx_mysql *mysql, struct mxq_job **jobs_result, struct mxq_daemon *daemon); -int mxq_unload_job_from_server(struct mx_mysql *mysql, struct mxq_daemon *daemon, uint64_t job_id); +int mxq_unload_job_from_server(struct mx_mysql *mysql, uint64_t job_id); #endif diff --git a/mxqd.c b/mxqd.c index 11f7efe1..008a447f 100644 --- a/mxqd.c +++ b/mxqd.c @@ -1323,12 +1323,12 @@ static unsigned long start_job(struct mxq_group_list *glist) mx_mysql_connect_forever(&(server->mysql)); if (pid < 0) { mx_log_err("fork: %m"); - mxq_unload_job_from_server(server->mysql, daemon, job->job_id); + mxq_unload_job_from_server(server->mysql, job->job_id); return(0); } waitpid(pid, &status, 0); if (status) { - mxq_unload_job_from_server(server->mysql, daemon, job->job_id); + mxq_unload_job_from_server(server->mysql, job->job_id); return 0; } } @@ -1343,7 +1343,7 @@ static unsigned long start_job(struct mxq_group_list *glist) if (pid < 0) { mx_log_err("fork: %m"); cpuset_clear_running(&job->host_cpu_set,&server->cpu_set_available); - mxq_unload_job_from_server(server->mysql, daemon, job->job_id); + mxq_unload_job_from_server(server->mysql, job->job_id); return 0; } else if (pid == 0) { job->host_pid = getpid();