diff options
author | Ilya Dryomov <idryomov@gmail.com> | 2018-02-22 13:19:04 +0100 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2018-04-02 10:12:46 +0200 |
commit | 5feb0d8d2f10c3f39f3d3a754dded74bb430a5e6 (patch) | |
tree | 76e90737741546573a1a68a21d09e8fb8ffd97ed /drivers/block/rbd.c | |
parent | rbd: remove redundant declaration of rbd_spec_put() (diff) | |
download | linux-5feb0d8d2f10c3f39f3d3a754dded74bb430a5e6.tar.xz linux-5feb0d8d2f10c3f39f3d3a754dded74bb430a5e6.zip |
rbd: move rbd_get_client() below rbd_put_client()
... to avoid a forward declaration in the next commit.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'drivers/block/rbd.c')
-rw-r--r-- | drivers/block/rbd.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 5416b44741a3..a3061925dac4 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -840,26 +840,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 * * Caller must hold rbd_client_list_lock. @@ -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; |