iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drivers: hv: fcopy: rename fcopy_work -> fcopy_timeout_work

Browse Source 
'fcopy_work' (and fcopy_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: Vitaly Kuznetsov <vkuznets@redhat.com>
Tested-by: Alex Ng <alexng@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Vitaly Kuznetsov 2015-04-11 18:07:45 -07:00 committed by Greg Kroah-Hartman
parent 68c8b39a0d
commit 1d072339fa
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/hv/hv_fcopy.c
View File

@ -75,11 +75,11 @@ static bool opened; /* currently device opened */
static bool in_hand_shake = true; static bool in_hand_shake = true;
static void fcopy_send_data(void); static void fcopy_send_data(void);
static void fcopy_respond_to_host(int error); static void fcopy_respond_to_host(int error);
static void fcopy_work_func(struct work_struct *dummy); static void fcopy_timeout_func(struct work_struct *dummy);
static DECLARE_DELAYED_WORK(fcopy_work, fcopy_work_func); static DECLARE_DELAYED_WORK(fcopy_timeout_work, fcopy_timeout_func);
static u8 *recv_buffer; static u8 *recv_buffer;
static void fcopy_work_func(struct work_struct *dummy) static void fcopy_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;
@ -261,7 +261,7 @@ void hv_fcopy_onchannelcallback(void *context)
/* /*
* Send the information to the user-level daemon. * Send the information to the user-level daemon.
*/ */
schedule_delayed_work(&fcopy_work, 5*HZ); schedule_delayed_work(&fcopy_timeout_work, 5*HZ);
fcopy_send_data(); fcopy_send_data();
return; return;
} }
@ -336,7 +336,7 @@ static ssize_t fcopy_write(struct file *file, const char __user *buf,
* Complete the transaction by forwarding the result * Complete the transaction by forwarding the result
* to the host. But first, cancel the timeout. * to the host. But first, cancel the timeout.
*/ */
if (cancel_delayed_work_sync(&fcopy_work)) { if (cancel_delayed_work_sync(&fcopy_timeout_work))
fcopy_respond_to_host(response); fcopy_respond_to_host(response);
hv_poll_channel(fcopy_transaction.fcopy_context, hv_poll_channel(fcopy_transaction.fcopy_context,
hv_fcopy_onchannelcallback); hv_fcopy_onchannelcallback);
@ -378,7 +378,7 @@ static int fcopy_release(struct inode *inode, struct file *f)
in_hand_shake = true; in_hand_shake = true;
opened = false; opened = false;
if (cancel_delayed_work_sync(&fcopy_work)) { if (cancel_delayed_work_sync(&fcopy_timeout_work)) {
/* We haven't up()-ed the semaphore(very rare)? */ /* We haven't up()-ed the semaphore(very rare)? */
if (down_trylock(&fcopy_transaction.read_sema)) if (down_trylock(&fcopy_transaction.read_sema))
; ;
@ -442,6 +442,6 @@ int hv_fcopy_init(struct hv_util_service *srv)
void hv_fcopy_deinit(void) void hv_fcopy_deinit(void)
{ {
cancel_delayed_work_sync(&fcopy_work); cancel_delayed_work_sync(&fcopy_timeout_work);
fcopy_dev_deinit(); fcopy_dev_deinit();
} }