From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932660Ab1JCU7m (ORCPT ); Mon, 3 Oct 2011 16:59:42 -0400 Received: from mail09.linbit.com ([212.69.161.110]:41598 "EHLO mail09.linbit.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932579Ab1JCU6h (ORCPT ); Mon, 3 Oct 2011 16:58:37 -0400 From: Philipp Reisner To: linux-kernel@vger.kernel.org, Jens Axboe Cc: drbd-dev@lists.linbit.com Subject: [PATCH 09/10] drbd: remove useless kobject_uevent from drbd_adm_connect Date: Mon, 3 Oct 2011 22:58:32 +0200 Message-Id: <1317675513-12745-10-git-send-email-philipp.reisner@linbit.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1317675513-12745-1-git-send-email-philipp.reisner@linbit.com> References: <1317675513-12745-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 Calling kobject_uevent, which may sleep, from within rcu_read_lock() protected regions is not possible. This particular kobject_uevent also is also wrong. It was supposed to trigger a udev run, just in case something relevant to udev symlink magic has changed, when adjusting runtime re-configurable settings while we still had the "syncer conf". It was improperly placed in connect when we dropped the "syncer conf". The right thing to do is probably to call "udevadm trigger" directly in those cases where drbdadm thinks there was a need to trigger extra udev runs. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- drivers/block/drbd/drbd_nl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 7926491..c475654 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -2088,15 +2088,15 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info) mutex_unlock(&tconn->net_conf_update); - retcode = conn_request_state(tconn, NS(conn, C_UNCONNECTED), CS_VERBOSE); - rcu_read_lock(); idr_for_each_entry(&tconn->volumes, mdev, i) { mdev->send_cnt = 0; mdev->recv_cnt = 0; - kobject_uevent(&disk_to_dev(mdev->vdisk)->kobj, KOBJ_CHANGE); } rcu_read_unlock(); + + retcode = conn_request_state(tconn, NS(conn, C_UNCONNECTED), CS_VERBOSE); + conn_reconfig_done(tconn); drbd_adm_finish(info, retcode); return 0; -- 1.7.4.1