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

Commit 5feb0d8d authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

rbd: move rbd_get_client() below rbd_put_client() 



... to avoid a forward declaration in the next commit.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 0a4a1e68

drivers/block/rbd.c

+20 −20
Original line number Diff line number Diff line
@@ -839,26 +839,6 @@ static char* obj_op_name(enum obj_operation_type op_type) 
	}

}



/*

 * Get a ceph client with specific addr and configuration, if one does

 * not exist create it.  Either way, ceph_opts is consumed by this

 * function.

 */

static struct rbd_client *rbd_get_client(struct ceph_options *ceph_opts)

{

	struct rbd_client *rbdc;



	mutex_lock_nested(&client_mutex, SINGLE_DEPTH_NESTING);

	rbdc = rbd_client_find(ceph_opts);

	if (rbdc)	/* using an existing client */

		ceph_destroy_options(ceph_opts);

	else

		rbdc = rbd_client_create(ceph_opts);

	mutex_unlock(&client_mutex);



	return rbdc;

}



/*

 * Destroy ceph client

 *
@@ -887,6 +867,26 @@ static void rbd_put_client(struct rbd_client *rbdc) 
		kref_put(&rbdc->kref, rbd_client_release);

}



/*

 * Get a ceph client with specific addr and configuration, if one does

 * not exist create it.  Either way, ceph_opts is consumed by this

 * function.

 */

static struct rbd_client *rbd_get_client(struct ceph_options *ceph_opts)

{

	struct rbd_client *rbdc;



	mutex_lock_nested(&client_mutex, SINGLE_DEPTH_NESTING);

	rbdc = rbd_client_find(ceph_opts);

	if (rbdc)	/* using an existing client */

		ceph_destroy_options(ceph_opts);

	else

		rbdc = rbd_client_create(ceph_opts);

	mutex_unlock(&client_mutex);



	return rbdc;

}



static bool rbd_image_format_valid(u32 image_format)

{

	return image_format == 1 || image_format == 2;