LU-17592 build: kernel 6.8 removed strlcpy()

[fs/lustre-release.git] / lustre / quota / qmt_dev.c

diff --git a/lustre/quota/qmt_dev.c b/lustre/quota/qmt_dev.c
index f785ac9..3126355 100644 (file)
--- a/lustre/quota/qmt_dev.c
+++ b/lustre/quota/qmt_dev.c
@@ -97,6 +97,11 @@ static struct lu_device *qmt_device_fini(const struct lu_env *env,
        CDEBUG(D_QUOTA, "%s: initiating QMT shutdown\n", qmt->qmt_svname);
        qmt->qmt_stopping = true;
 
+       if (qmt_lvbo_free_wq) {
+               destroy_workqueue(qmt_lvbo_free_wq);
+               qmt_lvbo_free_wq = NULL;
+       }
+
        /* kill pool instances, if any */
        qmt_pool_fini(env, qmt);
 
@@ -216,9 +221,9 @@ static int qmt_device_init0(const struct lu_env *env, struct qmt_device *qmt,
                RETURN(-EINVAL);
 
        /* record who i am, it might be useful ... */
-       rc = strlcpy(qmt->qmt_svname, svname, sizeof(qmt->qmt_svname));
-       if (rc >= sizeof(qmt->qmt_svname))
-               RETURN(-E2BIG);
+       rc = strscpy(qmt->qmt_svname, svname, sizeof(qmt->qmt_svname));
+       if (rc < 0)
+               RETURN(rc);
 
        /* look-up the obd_device associated with the qmt */
        obd = class_name2obd(qmt->qmt_svname);
@@ -280,6 +285,14 @@ static int qmt_device_init0(const struct lu_env *env, struct qmt_device *qmt,
        if (rc)
                GOTO(out, rc);
 
+       qmt_lvbo_free_wq = alloc_workqueue("qmt_lvbo_free", WQ_UNBOUND, 0);
+       if (!qmt_lvbo_free_wq) {
+               rc = -ENOMEM;
+               CERROR("%s: failed to start qmt_lvbo_free workqueue: rc = %d\n",
+                      qmt->qmt_svname, rc);
+               goto out;
+       }
+
        EXIT;
 out:
        if (rc)
@@ -355,7 +368,7 @@ LU_CONTEXT_KEY_DEFINE(qmt, LCT_MD_THREAD);
 /*
  * lu device type operations associated with the master target.
  */
-static struct lu_device_type_operations qmt_device_type_ops = {
+static const struct lu_device_type_operations qmt_device_type_ops = {
        .ldto_init              = qmt_type_init,
        .ldto_fini              = qmt_type_fini,
 
@@ -484,7 +497,7 @@ int qmt_glb_init(void)
        int rc;
        ENTRY;
 
-       rc = class_register_type(&qmt_obd_ops, NULL, true, NULL,
+       rc = class_register_type(&qmt_obd_ops, NULL, true,
                                 LUSTRE_QMT_NAME, &qmt_device_type);
        RETURN(rc);
 }