Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 432b8587 authored by Alex Elder's avatar Alex Elder
Browse files

rbd: rename "node_lock" 



The spinlock used to protect rbd_client_list is named "node_lock".
Rename it to "rbd_client_list_lock" to make it more obvious what
it's for.

Signed-off-by: default avatarAlex Elder <elder@dreamhost.com>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent bc534d86

drivers/block/rbd.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -180,7 +180,7 @@ static LIST_HEAD(rbd_dev_list); /* devices */ 
static DEFINE_SPINLOCK(rbd_dev_list_lock);

static DEFINE_SPINLOCK(rbd_dev_list_lock);





static LIST_HEAD(rbd_client_list);		/* clients */

static LIST_HEAD(rbd_client_list);		/* clients */

static DEFINE_SPINLOCK(node_lock);      /* protects client get/put */

static DEFINE_SPINLOCK(rbd_client_list_lock);





static int __rbd_init_snaps_header(struct rbd_device *rbd_dev);

static int __rbd_init_snaps_header(struct rbd_device *rbd_dev);

static void rbd_dev_release(struct device *dev);

static void rbd_dev_release(struct device *dev);
@@ -270,9 +270,9 @@ static struct rbd_client *rbd_client_create(struct ceph_options *opt, 




	rbdc->rbd_opts = rbd_opts;

	rbdc->rbd_opts = rbd_opts;





	spin_lock(&node_lock);

	spin_lock(&rbd_client_list_lock);

	list_add_tail(&rbdc->node, &rbd_client_list);

	list_add_tail(&rbdc->node, &rbd_client_list);

	spin_unlock(&node_lock);

	spin_unlock(&rbd_client_list_lock);





	mutex_unlock(&ctl_mutex);

	mutex_unlock(&ctl_mutex);
@@ -385,12 +385,12 @@ static int rbd_get_client(struct rbd_device *rbd_dev, const char *mon_addr, 
		goto done_err;

		goto done_err;

	}

	}





	spin_lock(&node_lock);

	spin_lock(&rbd_client_list_lock);

	rbdc = __rbd_client_find(opt);

	rbdc = __rbd_client_find(opt);

	if (rbdc) {

	if (rbdc) {

		/* using an existing client */

		/* using an existing client */

		kref_get(&rbdc->kref);

		kref_get(&rbdc->kref);

		spin_unlock(&node_lock);

		spin_unlock(&rbd_client_list_lock);





		rbd_dev->rbd_client = rbdc;

		rbd_dev->rbd_client = rbdc;
@@ -399,7 +399,7 @@ static int rbd_get_client(struct rbd_device *rbd_dev, const char *mon_addr, 




		return 0;

		return 0;

	}

	}

	spin_unlock(&node_lock);

	spin_unlock(&rbd_client_list_lock);





	rbdc = rbd_client_create(opt, rbd_opts);

	rbdc = rbd_client_create(opt, rbd_opts);
@@ -418,7 +418,7 @@ static int rbd_get_client(struct rbd_device *rbd_dev, const char *mon_addr, 
/*

/*

 * Destroy ceph client

 * Destroy ceph client

 *

 *

 * Caller must hold node_lock.

 * Caller must hold rbd_client_list_lock.

 */

 */

static void rbd_client_release(struct kref *kref)

static void rbd_client_release(struct kref *kref)

{

{
@@ -438,9 +438,9 @@ static void rbd_client_release(struct kref *kref) 
 */

 */

static void rbd_put_client(struct rbd_device *rbd_dev)

static void rbd_put_client(struct rbd_device *rbd_dev)

{

{

	spin_lock(&node_lock);

	spin_lock(&rbd_client_list_lock);

	kref_put(&rbd_dev->rbd_client->kref, rbd_client_release);

	kref_put(&rbd_dev->rbd_client->kref, rbd_client_release);

	spin_unlock(&node_lock);

	spin_unlock(&rbd_client_list_lock);

	rbd_dev->rbd_client = NULL;

	rbd_dev->rbd_client = NULL;

}

}