Drivers: hv: utils: rename outmsg_lock

As a preparation to reusing outmsg_lock to protect test-and-set openrations
on 'mode' rename it the more general 'lock'.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hv/hv_utils_transport.c b/drivers/hv/hv_utils_transport.c
index 40abe44fcd984b7d9cd2e5631a2e09bd1a5eb162..59c6f3d29f9a1e8c4e4c869ebb058f3aae40e9ef 100644 (file)
--- a/drivers/hv/hv_utils_transport.c
+++ b/drivers/hv/hv_utils_transport.c
@@ -27,11 +27,11 @@ static struct list_head hvt_list = LIST_HEAD_INIT(hvt_list);
 
 static void hvt_reset(struct hvutil_transport *hvt)
 {
-       mutex_lock(&hvt->outmsg_lock);
+       mutex_lock(&hvt->lock);
        kfree(hvt->outmsg);
        hvt->outmsg = NULL;
        hvt->outmsg_len = 0;
-       mutex_unlock(&hvt->outmsg_lock);
+       mutex_unlock(&hvt->lock);
        if (hvt->on_reset)
                hvt->on_reset();
 }
@@ -47,7 +47,7 @@ static ssize_t hvt_op_read(struct file *file, char __user *buf,
        if (wait_event_interruptible(hvt->outmsg_q, hvt->outmsg_len > 0))
                return -EINTR;
 
-       mutex_lock(&hvt->outmsg_lock);
+       mutex_lock(&hvt->lock);
        if (!hvt->outmsg) {
                ret = -EAGAIN;
                goto out_unlock;
@@ -68,7 +68,7 @@ static ssize_t hvt_op_read(struct file *file, char __user *buf,
        hvt->outmsg_len = 0;
 
 out_unlock:
-       mutex_unlock(&hvt->outmsg_lock);
+       mutex_unlock(&hvt->lock);
        return ret;
 }
 
@@ -197,7 +197,7 @@ int hvutil_transport_send(struct hvutil_transport *hvt, void *msg, int len)
                return ret;
        }
        /* HVUTIL_TRANSPORT_CHARDEV */
-       mutex_lock(&hvt->outmsg_lock);
+       mutex_lock(&hvt->lock);
        if (hvt->outmsg) {
                /* Previous message wasn't received */
                ret = -EFAULT;
@@ -211,7 +211,7 @@ int hvutil_transport_send(struct hvutil_transport *hvt, void *msg, int len)
        } else
                ret = -ENOMEM;
 out_unlock:
-       mutex_unlock(&hvt->outmsg_lock);
+       mutex_unlock(&hvt->lock);
        return ret;
 }
 
@@ -242,7 +242,7 @@ struct hvutil_transport *hvutil_transport_init(const char *name,
        hvt->mdev.fops = &hvt->fops;
 
        init_waitqueue_head(&hvt->outmsg_q);
-       mutex_init(&hvt->outmsg_lock);
+       mutex_init(&hvt->lock);
 
        spin_lock(&hvt_list_lock);
        list_add(&hvt->list, &hvt_list);

diff --git a/drivers/hv/hv_utils_transport.h b/drivers/hv/hv_utils_transport.h
index 314c76ce1b07f4d290682b94d108013fb99ce37a..bff4c921e8178ffef73a02719b6d9342db3dbe52 100644 (file)
--- a/drivers/hv/hv_utils_transport.h
+++ b/drivers/hv/hv_utils_transport.h
@@ -38,7 +38,7 @@ struct hvutil_transport {
        u8 *outmsg;                         /* message to the userspace */
        int outmsg_len;                     /* its length */
        wait_queue_head_t outmsg_q;         /* poll/read wait queue */
-       struct mutex outmsg_lock;           /* protects outmsg */
+       struct mutex lock;                  /* protects struct members */
 };
 
 struct hvutil_transport *hvutil_transport_init(const char *name,