X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fsyscall_setsched-v21.hc;h=83793b8f7e210af0bf7b092562976397d85bf1ca;hb=HEAD;hp=2023447f854b6070ddaa7548e7e9589cb51982e4;hpb=e6580882caefa10d48e7668d879b52d80b87a6b2;p=util-vserver.git diff --git a/lib/syscall_setsched-v21.hc b/lib/syscall_setsched-v21.hc index 2023447..83793b8 100644 --- a/lib/syscall_setsched-v21.hc +++ b/lib/syscall_setsched-v21.hc @@ -26,8 +26,8 @@ static inline ALWAYSINLINE int vc_set_sched_v21(xid_t xid, struct vc_set_sched const *data) { struct vcmd_set_sched_v4 k_data; + int ret; - k_data.set_mask = data->set_mask; k_data.fill_rate = data->fill_rate; k_data.interval = data->interval; k_data.tokens = data->tokens; @@ -35,7 +35,23 @@ vc_set_sched_v21(xid_t xid, struct vc_set_sched const *data) k_data.tokens_max = data->tokens_max; k_data.prio_bias = data->priority_bias; k_data.cpu_id = data->cpu_id; - k_data.bucket_id = data->bucked_it; + k_data.bucket_id = data->bucket_id; - return vserver(VCMD_set_sched, CTX_USER2KERNEL(xid), &k_data); + if ((data->set_mask & VC_VXSM_FILL_RATE2 && data->fill_rate != data->fill_rate2) || + (data->set_mask & VC_VXSM_INTERVAL2 && data->interval != data->interval2)) { + /* first set the regular values */ + k_data.set_mask = data->set_mask & ~(VC_VXSM_FILL_RATE2|VC_VXSM_INTERVAL2|VC_VXSM_FORCE); + ret = vserver(VCMD_set_sched_v4, CTX_USER2KERNEL(xid), &k_data); + if (ret) + return ret; + /* then set idle time */ + k_data.set_mask = data->set_mask & (VC_VXSM_FILL_RATE2|VC_VXSM_INTERVAL2|VC_VXSM_FORCE|VC_VXSM_IDLE_TIME|VC_VXSM_CPU_ID|VC_VXSM_BUCKET_ID); + k_data.fill_rate = data->fill_rate2; + k_data.interval = data->interval2; + return vserver(VCMD_set_sched_v4, CTX_USER2KERNEL(xid), &k_data); + } + else { + k_data.set_mask = data->set_mask; + return vserver(VCMD_set_sched_v4, CTX_USER2KERNEL(xid), &k_data); + } }