Commit f82795d6 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner

drbd: Rename drbd_{create,delete}_minor -> drbd_{create,delete}_device

Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent 0b0ba1ef
...@@ -1239,9 +1239,9 @@ extern struct bio *bio_alloc_drbd(gfp_t gfp_mask); ...@@ -1239,9 +1239,9 @@ extern struct bio *bio_alloc_drbd(gfp_t gfp_mask);
extern rwlock_t global_state_lock; extern rwlock_t global_state_lock;
extern int conn_lowest_minor(struct drbd_connection *connection); extern int conn_lowest_minor(struct drbd_connection *connection);
enum drbd_ret_code drbd_create_minor(struct drbd_connection *connection, unsigned int minor, int vnr); enum drbd_ret_code drbd_create_device(struct drbd_connection *connection, unsigned int minor, int vnr);
extern void drbd_destroy_device(struct kref *kref); extern void drbd_destroy_device(struct kref *kref);
extern void drbd_delete_minor(struct drbd_device *mdev); extern void drbd_delete_device(struct drbd_device *mdev);
extern struct drbd_resource *drbd_create_resource(const char *name); extern struct drbd_resource *drbd_create_resource(const char *name);
extern void drbd_free_resource(struct drbd_resource *resource); extern void drbd_free_resource(struct drbd_resource *resource);
......
...@@ -2327,7 +2327,7 @@ static void drbd_cleanup(void) ...@@ -2327,7 +2327,7 @@ static void drbd_cleanup(void)
drbd_genl_unregister(); drbd_genl_unregister();
idr_for_each_entry(&drbd_devices, device, i) idr_for_each_entry(&drbd_devices, device, i)
drbd_delete_minor(device); drbd_delete_device(device);
/* not _rcu since, no other updater anymore. Genl already unregistered */ /* not _rcu since, no other updater anymore. Genl already unregistered */
for_each_resource_safe(resource, tmp, &drbd_resources) { for_each_resource_safe(resource, tmp, &drbd_resources) {
...@@ -2659,7 +2659,7 @@ static int init_submitter(struct drbd_device *device) ...@@ -2659,7 +2659,7 @@ static int init_submitter(struct drbd_device *device)
return 0; return 0;
} }
enum drbd_ret_code drbd_create_minor(struct drbd_connection *connection, unsigned int minor, int vnr) enum drbd_ret_code drbd_create_device(struct drbd_connection *connection, unsigned int minor, int vnr)
{ {
struct drbd_resource *resource = connection->resource; struct drbd_resource *resource = connection->resource;
struct drbd_device *device; struct drbd_device *device;
...@@ -2809,7 +2809,7 @@ enum drbd_ret_code drbd_create_minor(struct drbd_connection *connection, unsigne ...@@ -2809,7 +2809,7 @@ enum drbd_ret_code drbd_create_minor(struct drbd_connection *connection, unsigne
return err; return err;
} }
void drbd_delete_minor(struct drbd_device *device) void drbd_delete_device(struct drbd_device *device)
{ {
struct drbd_resource *resource = device->resource; struct drbd_resource *resource = device->resource;
struct drbd_connection *connection; struct drbd_connection *connection;
......
...@@ -3328,7 +3328,7 @@ int drbd_adm_new_minor(struct sk_buff *skb, struct genl_info *info) ...@@ -3328,7 +3328,7 @@ int drbd_adm_new_minor(struct sk_buff *skb, struct genl_info *info)
goto out; goto out;
} }
retcode = drbd_create_minor(adm_ctx.connection, dh->minor, adm_ctx.volume); retcode = drbd_create_device(adm_ctx.connection, dh->minor, adm_ctx.volume);
out: out:
drbd_adm_finish(info, retcode); drbd_adm_finish(info, retcode);
return 0; return 0;
...@@ -3343,7 +3343,7 @@ static enum drbd_ret_code adm_del_minor(struct drbd_device *device) ...@@ -3343,7 +3343,7 @@ static enum drbd_ret_code adm_del_minor(struct drbd_device *device)
device->state.role == R_SECONDARY) { device->state.role == R_SECONDARY) {
_drbd_request_state(device, NS(conn, C_WF_REPORT_PARAMS), _drbd_request_state(device, NS(conn, C_WF_REPORT_PARAMS),
CS_VERBOSE + CS_WAIT_COMPLETE); CS_VERBOSE + CS_WAIT_COMPLETE);
drbd_delete_minor(device); drbd_delete_device(device);
return NO_ERROR; return NO_ERROR;
} else } else
return ERR_MINOR_CONFIGURED; return ERR_MINOR_CONFIGURED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment