From: Matthias Schiffer Date: Tue, 28 May 2013 15:32:32 +0000 (+0200) Subject: batman-adv: wait for rtnl in batadv_store_mesh_iface instead of failing if it is... X-Git-Tag: v3.10-rc6~2^2~16^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac16d1484efd5d2d9077c55453b1f8abff49fc18;p=pandora-kernel.git batman-adv: wait for rtnl in batadv_store_mesh_iface instead of failing if it is taken The rtnl_lock in batadv_store_mesh_iface has been converted to a rtnl_trylock some time ago to avoid a possible deadlock between rtnl and s_active on removal of the sysfs nodes. The behaviour introduced by that was quite confusing as it could lead to the sysfs store to fail, making batman-adv setup scripts unreliable. As recently the sysfs removal was postponed to a worker not running with the rtnl taken, the deadlock can't occur any more and it is safe to change the trylock back to a lock to make the sysfs store reliable again. Signed-off-by: Matthias Schiffer Reviewed-by: Simon Wunderlich Signed-off-by: Marek Lindner Signed-off-by: Antonio Quartulli --- Reading git-diff-tree failed