From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932312Ab1IAMub (ORCPT ); Thu, 1 Sep 2011 08:50:31 -0400 Received: from mail09.linbit.com ([212.69.161.110]:55771 "EHLO mail09.linbit.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932179Ab1IAMtO (ORCPT ); Thu, 1 Sep 2011 08:49:14 -0400 From: Philipp Reisner To: linux-kernel@vger.kernel.org, Jens Axboe Cc: drbd-dev@lists.linbit.com Subject: [PATCH 14/18] drbd: Allow a Diskless Secondary volume to be removed Date: Thu, 1 Sep 2011 14:49:01 +0200 Message-Id: <1314881345-6420-15-git-send-email-philipp.reisner@linbit.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314881345-6420-1-git-send-email-philipp.reisner@linbit.com> References: <1314881345-6420-1-git-send-email-philipp.reisner@linbit.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lars Ellenberg 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 Signed-off-by: Lars Ellenberg --- drivers/block/drbd/drbd_nl.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index c389995..740649b 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -248,6 +248,8 @@ static int drbd_adm_prepare(struct sk_buff *skb, struct genl_info *info, drbd_msg_put_info("over-determined configuration context mismatch"); return ERR_INVALID_REQUEST; } + if (adm_ctx.mdev && !adm_ctx.tconn) + adm_ctx.tconn = adm_ctx.mdev->tconn; return NO_ERROR; fail: @@ -2676,10 +2678,15 @@ int drbd_adm_delete_minor(struct sk_buff *skb, struct genl_info *info) mdev = adm_ctx.mdev; 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) { drbd_delete_device(mdev_to_minor(mdev)); retcode = NO_ERROR; + /* if this was the last volume of this connection, + * this will terminate all threads */ + conn_reconfig_done(adm_ctx.tconn); } else retcode = ERR_MINOR_CONFIGURED; out: -- 1.7.4.1