Skip to content

Commit

Permalink
rbd: move rbd_get_client() below rbd_put_client()
Browse files Browse the repository at this point in the history
... to avoid a forward declaration in the next commit.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
  • Loading branch information
Ilya Dryomov committed Apr 2, 2018
1 parent 0a4a1e6 commit 5feb0d8
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 5feb0d8

Please sign in to comment.