openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drbd: Allow a Diskless Secondary volume to be removed 

Even if the connection is still established.
We should be able to reduce a volume from a replication group,
without taking the whole group offline.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Lars Ellenberg 2011-03-10 23:33:15 +01:00 committed by Philipp Reisner
parent d0456c72df
commit cffec5b2fe
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,6 +220,8 @@ static int drbd_adm_prepare(struct sk_buff *skb, struct genl_info *info,
drbd_msg_put_info("over-determined configuration context mismatch"); drbd_msg_put_info("over-determined configuration context mismatch");
return ERR_INVALID_REQUEST; return ERR_INVALID_REQUEST;
} }
if (adm_ctx.mdev && !adm_ctx.tconn)
adm_ctx.tconn = adm_ctx.mdev->tconn;
return NO_ERROR; return NO_ERROR;
fail: fail:
@ -2643,10 +2645,15 @@ int drbd_adm_delete_minor(struct sk_buff *skb, struct genl_info *info)
mdev = adm_ctx.mdev; mdev = adm_ctx.mdev;
if (mdev->state.disk == D_DISKLESS && if (mdev->state.disk == D_DISKLESS &&
mdev->state.conn == C_STANDALONE && /* no need to be mdev->state.conn == C_STANDALONE &&
* we may want to delete a minor from a live replication group.
*/
mdev->state.role == R_SECONDARY) { mdev->state.role == R_SECONDARY) {
drbd_delete_device(mdev_to_minor(mdev)); drbd_delete_device(mdev_to_minor(mdev));
retcode = NO_ERROR; retcode = NO_ERROR;
/* if this was the last volume of this connection,
* this will terminate all threads */
conn_reconfig_done(adm_ctx.tconn);
} else } else
retcode = ERR_MINOR_CONFIGURED; retcode = ERR_MINOR_CONFIGURED;
out: out: