Commit 68c8b39a authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Greg Kroah-Hartman

Drivers: hv: kvp: rename kvp_work -> kvp_timeout_work

'kvp_work' (and kvp_work_func) is a misnomer as it sounds like we expect
this useful work to happen and in reality it is just an emergency escape when
timeout happens.
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Tested-by: default avatarAlex Ng <alexng@microsoft.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 38c06c29
...@@ -79,10 +79,10 @@ static void kvp_send_key(struct work_struct *dummy); ...@@ -79,10 +79,10 @@ static void kvp_send_key(struct work_struct *dummy);
static void kvp_respond_to_host(struct hv_kvp_msg *msg, int error); static void kvp_respond_to_host(struct hv_kvp_msg *msg, int error);
static void kvp_work_func(struct work_struct *dummy); static void kvp_timeout_func(struct work_struct *dummy);
static void kvp_register(int); static void kvp_register(int);
static DECLARE_DELAYED_WORK(kvp_work, kvp_work_func); static DECLARE_DELAYED_WORK(kvp_timeout_work, kvp_timeout_func);
static DECLARE_WORK(kvp_sendkey_work, kvp_send_key); static DECLARE_WORK(kvp_sendkey_work, kvp_send_key);
static struct cb_id kvp_id = { CN_KVP_IDX, CN_KVP_VAL }; static struct cb_id kvp_id = { CN_KVP_IDX, CN_KVP_VAL };
...@@ -118,8 +118,8 @@ kvp_register(int reg_value) ...@@ -118,8 +118,8 @@ kvp_register(int reg_value)
kfree(msg); kfree(msg);
} }
} }
static void
kvp_work_func(struct work_struct *dummy) static void kvp_timeout_func(struct work_struct *dummy)
{ {
/* /*
* If the timer fires, the user-mode component has not responded; * If the timer fires, the user-mode component has not responded;
...@@ -215,7 +215,7 @@ kvp_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp) ...@@ -215,7 +215,7 @@ kvp_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)
* Complete the transaction by forwarding the key value * Complete the transaction by forwarding the key value
* to the host. But first, cancel the timeout. * to the host. But first, cancel the timeout.
*/ */
if (cancel_delayed_work_sync(&kvp_work)) if (cancel_delayed_work_sync(&kvp_timeout_work))
kvp_respond_to_host(message, error); kvp_respond_to_host(message, error);
} }
...@@ -440,7 +440,7 @@ kvp_send_key(struct work_struct *dummy) ...@@ -440,7 +440,7 @@ kvp_send_key(struct work_struct *dummy)
rc = cn_netlink_send(msg, 0, 0, GFP_ATOMIC); rc = cn_netlink_send(msg, 0, 0, GFP_ATOMIC);
if (rc) { if (rc) {
pr_debug("KVP: failed to communicate to the daemon: %d\n", rc); pr_debug("KVP: failed to communicate to the daemon: %d\n", rc);
if (cancel_delayed_work_sync(&kvp_work)) if (cancel_delayed_work_sync(&kvp_timeout_work))
kvp_respond_to_host(message, HV_E_FAIL); kvp_respond_to_host(message, HV_E_FAIL);
} }
...@@ -668,7 +668,7 @@ void hv_kvp_onchannelcallback(void *context) ...@@ -668,7 +668,7 @@ void hv_kvp_onchannelcallback(void *context)
* user-mode not responding. * user-mode not responding.
*/ */
schedule_work(&kvp_sendkey_work); schedule_work(&kvp_sendkey_work);
schedule_delayed_work(&kvp_work, 5*HZ); schedule_delayed_work(&kvp_timeout_work, 5*HZ);
return; return;
...@@ -708,6 +708,6 @@ hv_kvp_init(struct hv_util_service *srv) ...@@ -708,6 +708,6 @@ hv_kvp_init(struct hv_util_service *srv)
void hv_kvp_deinit(void) void hv_kvp_deinit(void)
{ {
cn_del_callback(&kvp_id); cn_del_callback(&kvp_id);
cancel_delayed_work_sync(&kvp_work); cancel_delayed_work_sync(&kvp_timeout_work);
cancel_work_sync(&kvp_sendkey_work); cancel_work_sync(&kvp_sendkey_work);
} }
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