hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
This commit is contained in:
Andreas Gruenbacher 2011-07-03 23:32:26 +02:00 committed by Philipp Reisner
parent 0b0ba1efc7
commit f82795d683
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/block/drbd/drbd_int.h
View File

@ -1239,9 +1239,9 @@ extern struct bio *bio_alloc_drbd(gfp_t gfp_mask);
extern rwlock_t global_state_lock;
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_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 void drbd_free_resource(struct drbd_resource *resource);

6
drivers/block/drbd/drbd_main.c
View File

@ -2327,7 +2327,7 @@ static void drbd_cleanup(void)
drbd_genl_unregister();
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 */
for_each_resource_safe(resource, tmp, &drbd_resources) {
@ -2659,7 +2659,7 @@ static int init_submitter(struct drbd_device *device)
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_device *device;
@ -2809,7 +2809,7 @@ out_no_peer_device:
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_connection *connection;

4
drivers/block/drbd/drbd_nl.c
View File

@ -3328,7 +3328,7 @@ int drbd_adm_new_minor(struct sk_buff *skb, struct genl_info *info)
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:
drbd_adm_finish(info, retcode);
return 0;
@ -3343,7 +3343,7 @@ static enum drbd_ret_code adm_del_minor(struct drbd_device *device)
device->state.role == R_SECONDARY) {
_drbd_request_state(device, NS(conn, C_WF_REPORT_PARAMS),
CS_VERBOSE + CS_WAIT_COMPLETE);
drbd_delete_minor(device);
drbd_delete_device(device);
return NO_ERROR;
} else
return ERR_MINOR_CONFIGURED;