From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Wed, 5 Feb 2014 05:17:01 +0000 (+0100)
Subject: drbd: re-add lost conf_mutex protection in drbd_set_role
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~74^2~51
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66ce6dbce2efa31d038a3148fa99bd86abd2203f;p=pandora-kernel.git

drbd: re-add lost conf_mutex protection in drbd_set_role

The conf_update mutex used to be held while clearing the
net_conf->discard_my_data flag inside drbd_set_role.

It was moved into drbd_adm_set_role with
    drbd: allow parallel promote/demote actions
but then replaced at that location by the newly introduced adm_mutex with
    drbd: Fix a potential deadlock in drbdsetup, introduce resource->adm_mutex

And I simply forgot to put it back in at the original location.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---

Reading git-diff-tree failed