LU-2224 osd-zfs: Fix osd_commit_async() locking

[fs/lustre-release.git] / lustre / osd-zfs / osd_handler.c

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index 6da92fa..5a345d6 100644 (file)
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -209,11 +209,10 @@ static int osd_trans_start(const struct lu_env *env, struct dt_device *d,
                if (!lu_device_is_md(&d->dd_lu_dev) && rc == -ENOSPC)
                        CERROR("%s: failed to start transaction due to ENOSPC. "
                               "Metadata overhead is underestimated or "
-                              "grant_ratio is too low.\n",
-                              osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name);
+                              "grant_ratio is too low.\n", osd->od_svname);
                else
                        CERROR("%s: can't assign tx: rc = %d\n",
-                              osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name, rc);
+                              osd->od_svname, rc);
        } else {
                /* add commit callback */
                dmu_tx_callback_register(oh->ot_tx, osd_trans_commit_cb, oh);
@@ -384,6 +383,7 @@ static int osd_commit_async(const struct lu_env *env, struct dt_device *dev)
        tx_state_t        *tx = &dmu_objset_pool(osd->od_objset.os)->dp_tx;
        uint64_t           txg;
 
+       mutex_enter(&tx->tx_sync_lock);
        txg = tx->tx_open_txg + 1;
        if (tx->tx_quiesce_txg_waiting < txg) {
                tx->tx_quiesce_txg_waiting = txg;
@@ -696,6 +696,7 @@ static struct lu_device *osd_device_fini(const struct lu_env *env,
        ENTRY;
 
 
+       osd_shutdown(env, o);
        osd_oi_fini(env, o);
 
        if (o->od_objset.os) {
@@ -755,8 +756,17 @@ static int osd_process_config(const struct lu_env *env,
 
 static int osd_recovery_complete(const struct lu_env *env, struct lu_device *d)
 {
+       struct osd_device       *osd = osd_dev(d);
+       int                      rc = 0;
        ENTRY;
-       RETURN(0);
+
+       if (osd->od_quota_slave == NULL)
+               RETURN(0);
+
+       /* start qsd instance on recovery completion, this notifies the quota
+        * slave code that we are about to process new requests now */
+       rc = qsd_start(env, osd->od_quota_slave);
+       RETURN(rc);
 }
 
 /*