diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-06-09 01:38:00 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-02-17 16:44:55 +0100 |
| commit | d8628a86576b278575750180fc5fab652a8224ca (patch) | |
| tree | a20b4bf3b7ff43e3e913ca60e78c5f9b9d71af05 | |
| parent | a10f6b8ae6971680ead81444b48c11263abd70a1 (diff) | |
| download | linux-next-d8628a86576b278575750180fc5fab652a8224ca.tar.gz | |
drbd: Add struct drbd_device->resource
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 | 1 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 1 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index b51ecdbdd30c..b66f908e724e 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -631,6 +631,7 @@ struct drbd_peer_device { }; struct drbd_device { + struct drbd_resource *resource; struct list_head peer_devices; int vnr; /* volume number within the connection */ struct kref kref; diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index f13d836e76a6..bf559adc21be 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2681,6 +2681,7 @@ enum drbd_ret_code drbd_create_minor(struct drbd_connection *connection, unsigne INIT_LIST_HEAD(&device->peer_devices); list_add(&peer_device->peer_devices, &device->peer_devices); kref_get(&connection->kref); + device->resource = connection->resource; peer_device->connection = connection; peer_device->device = device; diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index ddff39182a23..f563feb479b7 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -251,7 +251,7 @@ static int drbd_adm_prepare(struct sk_buff *skb, struct genl_info *info, first_peer_device(adm_ctx.device)->connection != adm_ctx.connection) { pr_warning("request: minor=%u, resource=%s; but that minor belongs to connection %s\n", adm_ctx.minor, adm_ctx.resource_name, - first_peer_device(adm_ctx.device)->connection->resource->name); + adm_ctx.device->resource->name); drbd_msg_put_info("minor exists in different resource"); return ERR_INVALID_REQUEST; } @@ -261,7 +261,7 @@ static int drbd_adm_prepare(struct sk_buff *skb, struct genl_info *info, pr_warning("request: minor=%u, volume=%u; but that minor is volume %u in %s\n", adm_ctx.minor, adm_ctx.volume, adm_ctx.device->vnr, - first_peer_device(adm_ctx.device)->connection->resource->name); + adm_ctx.device->resource->name); drbd_msg_put_info("minor exists as different volume"); return ERR_INVALID_REQUEST; } |