diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-07-06 14:20:49 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-02-17 16:46:42 +0100 |
| commit | 59515a2e3e23cee7cf7b133f7241c689a9d71136 (patch) | |
| tree | 3f8de0eff769becefa1add38e72ef63b4bf78f99 | |
| parent | 5c6610422a9684d03c3cbb1b1b422c428bf712f5 (diff) | |
drbd: drbd_create_device(): Take a resource instead of a connection argument
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 2 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 4 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 21037bda905e..34ba7439abe1 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -1239,7 +1239,7 @@ 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_device(struct drbd_connection *connection, unsigned int minor, int vnr); +enum drbd_ret_code drbd_create_device(struct drbd_resource *resource, unsigned int minor, int vnr); extern void drbd_destroy_device(struct kref *kref); extern void drbd_delete_device(struct drbd_device *mdev); diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 522e103ce494..b00a8d74f6cb 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2659,9 +2659,9 @@ static int init_submitter(struct drbd_device *device) return 0; } -enum drbd_ret_code drbd_create_device(struct drbd_connection *connection, unsigned int minor, int vnr) +enum drbd_ret_code drbd_create_device(struct drbd_resource *resource, unsigned int minor, int vnr) { - struct drbd_resource *resource = connection->resource; + struct drbd_connection *connection = first_connection(resource); struct drbd_device *device; struct drbd_peer_device *peer_device; struct gendisk *disk; diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index fde2d257eb86..2bac2d9efb04 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -3348,7 +3348,7 @@ int drbd_adm_new_minor(struct sk_buff *skb, struct genl_info *info) goto out; } - retcode = drbd_create_device(adm_ctx.connection, dh->minor, adm_ctx.volume); + retcode = drbd_create_device(adm_ctx.resource, dh->minor, adm_ctx.volume); out: drbd_adm_finish(info, retcode); return 0; |