From 7faeeb62c0a1a2300269b759bdb1acb30da06b28 Mon Sep 17 00:00:00 2001 From: Danny Auble <da@schedmd.com> Date: Wed, 9 Apr 2014 15:37:35 -0700 Subject: [PATCH] Simplify duplicate code --- src/plugins/priority/multifactor/priority_multifactor.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/plugins/priority/multifactor/priority_multifactor.c b/src/plugins/priority/multifactor/priority_multifactor.c index cd00ad4cd49..41854dcca42 100644 --- a/src/plugins/priority/multifactor/priority_multifactor.c +++ b/src/plugins/priority/multifactor/priority_multifactor.c @@ -598,13 +598,8 @@ static void _get_priority_factors(time_t start_time, struct job_record *job_ptr) if (start_time > use_time) diff = start_time - use_time; - if (job_ptr->details->begin_time) { - if (diff < max_age) { - job_ptr->prio_factors->priority_age = - (double)diff / (double)max_age; - } else - job_ptr->prio_factors->priority_age = 1.0; - } else if (flags & PRIORITY_FLAGS_ACCRUE_ALWAYS) { + if (job_ptr->details->begin_time + || (flags & PRIORITY_FLAGS_ACCRUE_ALWAYS)) { if (diff < max_age) { job_ptr->prio_factors->priority_age = (double)diff / (double)max_age; -- GitLab