diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-07-06 15:05:58 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-02-17 16:46:45 +0100 |
| commit | 3ab706fe52a5cc12b021d7861943581db766a171 (patch) | |
| tree | f209f0a447cb402be39de73f9a04572e929112b4 /drivers | |
| parent | b6f85ef9538b2111a8ba0bbfae9aaebabfc94961 (diff) | |
| download | linux-3ab706fe52a5cc12b021d7861943581db766a171.tar.gz linux-3ab706fe52a5cc12b021d7861943581db766a171.tar.xz | |
drbd: drbd_adm_prepare(): Only set adm_ctx.connection when a connection is requested
Also change drbd_adm_connect() to expect a resource after it requested one.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 8ebcf88b0c1b..664e913cef43 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -216,10 +216,6 @@ static int drbd_adm_prepare(struct sk_buff *skb, struct genl_info *info, adm_ctx.device = minor_to_device(d_in->minor); if (adm_ctx.resource_name) { adm_ctx.resource = drbd_find_resource(adm_ctx.resource_name); - if (adm_ctx.resource) { - adm_ctx.connection = first_connection(adm_ctx.resource); - kref_get(&adm_ctx.connection->kref); - } } if (!adm_ctx.device && (flags & DRBD_ADM_NEED_MINOR)) { @@ -234,7 +230,7 @@ static int drbd_adm_prepare(struct sk_buff *skb, struct genl_info *info, } if (flags & DRBD_ADM_NEED_CONNECTION) { - if (adm_ctx.connection && !(flags & DRBD_ADM_NEED_RESOURCE)) { + if (adm_ctx.resource) { drbd_msg_put_info("no resource name expected"); return ERR_INVALID_REQUEST; } @@ -2211,7 +2207,7 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info) } } - connection = adm_ctx.connection; + connection = first_connection(adm_ctx.resource); conn_reconfig_start(connection); if (connection->cstate > C_STANDALONE) { |