staging: lustre: remove initialization of static ints

[firefly-linux-kernel-4.4.55.git] / drivers / staging / lustre / lustre / obdclass / genops.c

diff --git a/drivers/staging/lustre/lustre/obdclass/genops.c b/drivers/staging/lustre/lustre/obdclass/genops.c
index 736ca410aca3b55f60baa022332834f66afc9a41..6d440b4658601c7de01c64f1f4d3320890c09493 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/genops.c
+++ b/drivers/staging/lustre/lustre/obdclass/genops.c
@@ -1151,22 +1151,24 @@ void class_export_recovery_cleanup(struct obd_export *exp)
                        exp->exp_obd->obd_stale_clients++;
        }
        spin_unlock(&obd->obd_recovery_task_lock);
+
+       spin_lock(&exp->exp_lock);
        /** Cleanup req replay fields */
        if (exp->exp_req_replay_needed) {
-               spin_lock(&exp->exp_lock);
                exp->exp_req_replay_needed = 0;
-               spin_unlock(&exp->exp_lock);
+
                LASSERT(atomic_read(&obd->obd_req_replay_clients));
                atomic_dec(&obd->obd_req_replay_clients);
        }
+
        /** Cleanup lock replay data */
        if (exp->exp_lock_replay_needed) {
-               spin_lock(&exp->exp_lock);
                exp->exp_lock_replay_needed = 0;
-               spin_unlock(&exp->exp_lock);
+
                LASSERT(atomic_read(&obd->obd_lock_replay_clients));
                atomic_dec(&obd->obd_lock_replay_clients);
        }
+       spin_unlock(&exp->exp_lock);
 }
 
 /* This function removes 1-3 references from the export:
@@ -1557,7 +1559,7 @@ void obd_exports_barrier(struct obd_device *obd)
 EXPORT_SYMBOL(obd_exports_barrier);
 
 /* Total amount of zombies to be destroyed */
-static int zombies_count = 0;
+static int zombies_count;
 
 /**
  * kill zombie imports and exports