From: Lars Ellenberg Date: Tue, 26 Apr 2011 14:22:25 +0000 (+0200) Subject: drbd: remove useless kobject_uevent from drbd_adm_connect X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5ee743e92d3b170a67b58c0c6ea169300983f58e;p=deliverable%2Flinux.git drbd: remove useless kobject_uevent from drbd_adm_connect 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 --- diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index caaef71ec614..1a8fb7a0db59 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -2043,15 +2043,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;