drbd: re-add lost conf_mutex protection in drbd_set_role
authorLars Ellenberg <lars.ellenberg@linbit.com>
Wed, 5 Feb 2014 05:17:01 +0000 (06:17 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 10 Jul 2014 16:34:52 +0000 (18:34 +0200)
commit66ce6dbce2efa31d038a3148fa99bd86abd2203f
tree30d150a3f103d1d3020e7e7987e1784777c77610
parentfcb096740a13c839e16e6735ba486879b54bc861
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>
drivers/block/drbd/drbd_nl.c