LU-6078 utils: fix copytool file bounds checking

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

diff --git a/lustre/quota/qmt_dev.c b/lustre/quota/qmt_dev.c
index 8512035..7c41c1a 100644 (file)
--- a/lustre/quota/qmt_dev.c
+++ b/lustre/quota/qmt_dev.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012 Intel, Inc.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
@@ -45,7 +45,7 @@
  * The QMT device is currently set up by the MDT and should probably be moved
  * to a separate target in the future. Meanwhile, the MDT forwards all quota
  * requests to the QMT via a list of request handlers (see struct qmt_handlers
- * in lquota.h). The QMT also borrows the LDLM namespace from the MDT.
+ * in lustre_quota.h). The QMT also borrows the LDLM namespace from the MDT.
  *
  * To bring up a QMT device, the following steps must be completed:
  *
@@ -66,10 +66,6 @@
  * mdt_quota_init() for more details.
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
 #include <obd_class.h>
@@ -110,6 +106,9 @@ static struct lu_device *qmt_device_fini(const struct lu_env *env,
                qmt->qmt_proc = NULL;
        }
 
+       /* stop rebalance thread */
+       qmt_stop_reba_thread(qmt);
+
        /* disconnect from OSD */
        if (qmt->qmt_child_exp != NULL) {
                obd_disconnect(qmt->qmt_child_exp);
@@ -117,12 +116,9 @@ static struct lu_device *qmt_device_fini(const struct lu_env *env,
                qmt->qmt_child = NULL;
        }
 
-       /* release reference on MDT namespace */
-       if (ld->ld_obd->obd_namespace != NULL) {
-               ldlm_namespace_put(ld->ld_obd->obd_namespace);
-               ld->ld_obd->obd_namespace = NULL;
-               qmt->qmt_ns = NULL;
-       }
+       /* clear references to MDT namespace */
+       ld->ld_obd->obd_namespace = NULL;
+       qmt->qmt_ns = NULL;
 
        RETURN(NULL);
 }
@@ -206,12 +202,17 @@ static int qmt_device_init0(const struct lu_env *env, struct qmt_device *qmt,
        struct lu_device        *ld = qmt2lu_dev(qmt);
        struct obd_device       *obd, *mdt_obd;
        struct obd_type         *type;
+       char                    *svname = lustre_cfg_string(cfg, 0);
        int                      rc;
        ENTRY;
 
+       if (svname == NULL)
+               RETURN(-EINVAL);
+
        /* record who i am, it might be useful ... */
-       strncpy(qmt->qmt_svname, lustre_cfg_string(cfg, 0),
-               sizeof(qmt->qmt_svname) - 1);
+       rc = strlcpy(qmt->qmt_svname, svname, sizeof(qmt->qmt_svname));
+       if (rc >= sizeof(qmt->qmt_svname))
+               RETURN(-E2BIG);
 
        /* look-up the obd_device associated with the qmt */
        obd = class_name2obd(qmt->qmt_svname);
@@ -227,10 +228,9 @@ static int qmt_device_init0(const struct lu_env *env, struct qmt_device *qmt,
        if (mdt_obd == NULL)
                RETURN(-ENOENT);
 
-       /* grab reference on MDT namespace. kind of a hack until we have our
-        * own namespace & service threads */
+       /* borrow  MDT namespace. kind of a hack until we have our own namespace
+        * & service threads */
        LASSERT(mdt_obd->obd_namespace != NULL);
-       ldlm_namespace_get(mdt_obd->obd_namespace);
        obd->obd_namespace = mdt_obd->obd_namespace;
        qmt->qmt_ns = obd->obd_namespace;
 
@@ -239,6 +239,18 @@ static int qmt_device_init0(const struct lu_env *env, struct qmt_device *qmt,
        if (rc)
                GOTO(out, rc);
 
+       /* set up and start rebalance thread */
+       thread_set_flags(&qmt->qmt_reba_thread, SVC_STOPPED);
+       init_waitqueue_head(&qmt->qmt_reba_thread.t_ctl_waitq);
+       INIT_LIST_HEAD(&qmt->qmt_reba_list);
+       spin_lock_init(&qmt->qmt_reba_lock);
+       rc = qmt_start_reba_thread(qmt);
+       if (rc) {
+               CERROR("%s: failed to start rebalance thread (%d)\n",
+                      qmt->qmt_svname, rc);
+               GOTO(out, rc);
+       }
+
        /* at the moment there is no linkage between lu_type and obd_type, so
         * we lookup obd_type this way */
        type = class_search_type(LUSTRE_QMT_NAME);
@@ -459,8 +471,8 @@ int qmt_glb_init(void)
        int rc;
        ENTRY;
 
-       rc = class_register_type(&qmt_obd_ops, NULL, NULL, LUSTRE_QMT_NAME,
-                                &qmt_device_type);
+       rc = class_register_type(&qmt_obd_ops, NULL, true, NULL,
+                                LUSTRE_QMT_NAME, &qmt_device_type);
        RETURN(rc);
 }