qeth: serialize sysfs-triggered device configurations

This patch serializes device removal and other sysfs-triggered
configurations by moving removal of sysfs-attributes to the beginning
of the remove functions. And it serializes online/offline setting
and discipline-switching (causing reestablishing of the net_device)
by making use of a new discipline mutex.

Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 15b5ca82bd26..e22ae248f613 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -3354,6 +3354,8 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)
 {
         struct qeth_card *card = dev_get_drvdata(&cgdev->dev);
 
+        qeth_l3_remove_device_attributes(&cgdev->dev);
+
         qeth_set_allowed_threads(card, 0, 1);
         wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);
 
@@ -3367,7 +3369,6 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)
                 card->dev = NULL;
         }
 
-        qeth_l3_remove_device_attributes(&cgdev->dev);
         qeth_l3_clear_ip_list(card, 0, 0);
         qeth_l3_clear_ipato_list(card);
         return;
@@ -3380,6 +3381,7 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         enum qeth_card_states recover_flag;
 
         BUG_ON(!card);
+        mutex_lock(&card->discipline_mutex);
         mutex_lock(&card->conf_mutex);
         QETH_DBF_TEXT(SETUP, 2, "setonlin");
         QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
@@ -3461,6 +3463,7 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
         kobject_uevent(&gdev->dev.kobj, KOBJ_CHANGE);
 out:
         mutex_unlock(&card->conf_mutex);
+        mutex_unlock(&card->discipline_mutex);
         return 0;
 out_remove:
         card->use_hard_stop = 1;
@@ -3473,6 +3476,7 @@ out_remove:
         else
                 card->state = CARD_STATE_DOWN;
         mutex_unlock(&card->conf_mutex);
+        mutex_unlock(&card->discipline_mutex);
         return rc;
 }
 
@@ -3488,6 +3492,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,
         int rc = 0, rc2 = 0, rc3 = 0;
         enum qeth_card_states recover_flag;
 
+        mutex_lock(&card->discipline_mutex);
         mutex_lock(&card->conf_mutex);
         QETH_DBF_TEXT(SETUP, 3, "setoffl");
         QETH_DBF_HEX(SETUP, 3, &card, sizeof(void *));
@@ -3508,6 +3513,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,
         /* let user_space know that device is offline */
         kobject_uevent(&cgdev->dev.kobj, KOBJ_CHANGE);
         mutex_unlock(&card->conf_mutex);
+        mutex_unlock(&card->discipline_mutex);
         return 0;
 }