X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_lib.c;h=6b827cbf3a03cf8a6914bd125659204de58b42ee;hb=d527e812461baf9db2f6ed960a3b6cc12d4ab37c;hp=0d0e518f5a6ace5bfeb63f485e22212769d607ed;hpb=1bdf0d6fcbe11efdf67ebdb09f04955b9ce88de4;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qsd_lib.c b/lustre/quota/qsd_lib.c
index 0d0e518..6b827cb 100644
--- a/lustre/quota/qsd_lib.c
+++ b/lustre/quota/qsd_lib.c
@@ -21,7 +21,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  * Use is subject to license terms.
  *
  * Author: Johann Lombardi <johann.lombardi@intel.com>
@@ -49,16 +49,12 @@
  * freed via qsd_fini().
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
 #include <obd_class.h>
 #include "qsd_internal.h"
 
-cfs_mem_cache_t *upd_kmem;
+struct kmem_cache *upd_kmem;
 
 struct lu_kmem_descr qsd_caches[] = {
 	{
@@ -73,16 +69,14 @@ struct lu_kmem_descr qsd_caches[] = {
 
 /* define qsd thread key */
 LU_KEY_INIT_FINI(qsd, struct qsd_thread_info);
-LU_CONTEXT_KEY_DEFINE(qsd, LCT_MD_THREAD | LCT_DT_THREAD | LCT_LOCAL);
+LU_CONTEXT_KEY_DEFINE(qsd, LCT_MD_THREAD | LCT_MG_THREAD | LCT_DT_THREAD | LCT_LOCAL);
 LU_KEY_INIT_GENERIC(qsd);
 
 /* some procfs helpers */
-static int lprocfs_qsd_rd_state(char *page, char **start, off_t off,
-				int count, int *eof, void *data)
+static int qsd_state_seq_show(struct seq_file *m, void *data)
 {
-	struct qsd_instance	*qsd = (struct qsd_instance *)data;
+	struct qsd_instance	*qsd = m->private;
 	char			 enabled[5];
-	int			 rc;
 
 	LASSERT(qsd != NULL);
 
@@ -91,18 +85,21 @@ static int lprocfs_qsd_rd_state(char *page, char **start, off_t off,
 		strcat(enabled, "u");
 	if (qsd_type_enabled(qsd, GRPQUOTA))
 		strcat(enabled, "g");
+	if (qsd_type_enabled(qsd, PRJQUOTA))
+		strncat(enabled, "p", 1);
 	if (strlen(enabled) == 0)
 		strcat(enabled, "none");
 
-	rc = snprintf(page, count,
-		      "target name:    %s\n"
-		      "pool ID:        %d\n"
-		      "type:           %s\n"
-		      "quota enabled:  %s\n"
-		      "conn to master: %s\n",
-		      qsd->qsd_svname, qsd->qsd_pool_id,
-		      qsd->qsd_is_md ? "md" : "dt", enabled,
-		      qsd->qsd_exp_valid ? "setup" : "not setup yet");
+	/* TODO: further pool ID should be removed or
+	 * replaced with pool Name */
+	seq_printf(m, "target name:    %s\n"
+		   "pool ID:        %d\n"
+		   "type:           %s\n"
+		   "quota enabled:  %s\n"
+		   "conn to master: %s\n",
+		   qsd->qsd_svname, 0,
+		   qsd->qsd_is_md ? "md" : "dt", enabled,
+		   qsd->qsd_exp_valid ? "setup" : "not setup yet");
 
 	if (qsd->qsd_prepared) {
 		memset(enabled, 0, sizeof(enabled));
@@ -110,49 +107,103 @@ static int lprocfs_qsd_rd_state(char *page, char **start, off_t off,
 			strcat(enabled, "u");
 		if (qsd->qsd_type_array[GRPQUOTA]->qqi_acct_obj != NULL)
 			strcat(enabled, "g");
+		if (qsd->qsd_type_array[PRJQUOTA]->qqi_acct_obj != NULL)
+			strncat(enabled, "p", 1);
 		if (strlen(enabled) == 0)
 			strcat(enabled, "none");
-		rc +=  snprintf(page + rc, count - rc,
-				"space acct:     %s\n"
-				"user uptodate:  glb[%d],slv[%d],reint[%d]\n"
-				"group uptodate: glb[%d],slv[%d],reint[%d]\n",
-				enabled,
-				qsd->qsd_type_array[USRQUOTA]->qqi_glb_uptodate,
-				qsd->qsd_type_array[USRQUOTA]->qqi_slv_uptodate,
-				qsd->qsd_type_array[USRQUOTA]->qqi_reint,
-				qsd->qsd_type_array[GRPQUOTA]->qqi_glb_uptodate,
-				qsd->qsd_type_array[GRPQUOTA]->qqi_slv_uptodate,
-				qsd->qsd_type_array[GRPQUOTA]->qqi_reint);
+		seq_printf(m, "space acct:     %s\n"
+			   "user uptodate:  glb[%d],slv[%d],reint[%d]\n"
+			   "group uptodate: glb[%d],slv[%d],reint[%d]\n"
+			   "project uptodate: glb[%d],slv[%d],reint[%d]\n",
+			   enabled,
+			   qsd->qsd_type_array[USRQUOTA]->qqi_glb_uptodate,
+			   qsd->qsd_type_array[USRQUOTA]->qqi_slv_uptodate,
+			   qsd->qsd_type_array[USRQUOTA]->qqi_reint,
+			   qsd->qsd_type_array[GRPQUOTA]->qqi_glb_uptodate,
+			   qsd->qsd_type_array[GRPQUOTA]->qqi_slv_uptodate,
+			   qsd->qsd_type_array[GRPQUOTA]->qqi_reint,
+			   qsd->qsd_type_array[PRJQUOTA]->qqi_glb_uptodate,
+			   qsd->qsd_type_array[PRJQUOTA]->qqi_slv_uptodate,
+			   qsd->qsd_type_array[PRJQUOTA]->qqi_reint);
 	}
-	return rc;
+	return 0;
 }
+LPROC_SEQ_FOPS_RO(qsd_state);
 
-static int lprocfs_qsd_rd_enabled(char *page, char **start, off_t off,
-				  int count, int *eof, void *data)
+static int qsd_enabled_seq_show(struct seq_file *m, void *data)
 {
-	struct qsd_instance	*qsd = (struct qsd_instance *)data;
+	struct qsd_instance	*qsd = m->private;
 	char			 enabled[5];
 
 	LASSERT(qsd != NULL);
 
 	memset(enabled, 0, sizeof(enabled));
 	if (qsd_type_enabled(qsd, USRQUOTA))
-		strcat(enabled, "u");
+		strncat(enabled, "u", sizeof(enabled) - strlen(enabled));
 	if (qsd_type_enabled(qsd, GRPQUOTA))
-		strcat(enabled, "g");
+		strncat(enabled, "g", sizeof(enabled) - strlen(enabled));
+	if (qsd_type_enabled(qsd, PRJQUOTA))
+		strncat(enabled, "p", sizeof(enabled) - strlen(enabled));
 	if (strlen(enabled) == 0)
-		strcat(enabled, "none");
+		strncat(enabled, "none", sizeof(enabled) - strlen(enabled));
 
-	return snprintf(page, count, "%s\n", enabled);
+	seq_printf(m, "%s\n", enabled);
+	return 0;
+}
+
+static ssize_t qsd_enabled_seq_write(struct file *file,
+				     const char __user *buffer,
+				     size_t count, loff_t *off)
+{
+	struct seq_file *m = file->private_data;
+	struct qsd_instance *qsd = m->private;
+	char fsname[LUSTRE_MAXFSNAME + 1];
+	int enabled = 0;
+	char valstr[5];
+	int pool, rc;
+
+	if (count > 4)
+		return -E2BIG;
+
+	if (copy_from_user(valstr, buffer, count))
+		GOTO(out, count = -EFAULT);
+
+	valstr[sizeof(valstr) - 1] = 0;
+	if (strchr(valstr, 'u'))
+		enabled |= BIT(USRQUOTA);
+	if (strchr(valstr, 'g'))
+		enabled |= BIT(GRPQUOTA);
+	if (strchr(valstr, 'p'))
+		enabled |= BIT(PRJQUOTA);
+
+	if (enabled == 0 && strcmp(valstr, "none"))
+		GOTO(out, count = -EINVAL);
+
+	if (qsd->qsd_is_md)
+		pool = LQUOTA_RES_MD;
+	else
+		pool = LQUOTA_RES_DT;
+
+	if (server_name2fsname(qsd->qsd_svname, fsname, NULL))
+		GOTO(out, count = -EINVAL);
+
+	rc = qsd_config(valstr, fsname, pool);
+	if (rc)
+		count = rc;
+out:
+	return count;
 }
+LPROC_SEQ_FOPS(qsd_enabled);
 
 /* force reintegration procedure to be executed.
  * Used for test/debugging purpose */
-static int lprocfs_qsd_wr_force_reint(struct file *file, const char *buffer,
-				      unsigned long count, void *data)
+static ssize_t
+lprocfs_force_reint_seq_write(struct file *file, const char __user *buffer,
+				size_t count, loff_t *off)
 {
-	struct qsd_instance	*qsd = (struct qsd_instance *)data;
-	int			 rc = 0, qtype;
+	struct seq_file	    *m = file->private_data;
+	struct qsd_instance *qsd = m->private;
+	int		     rc = 0, qtype;
 
 	LASSERT(qsd != NULL);
 
@@ -165,7 +216,7 @@ static int lprocfs_qsd_wr_force_reint(struct file *file, const char *buffer,
 		rc = -EAGAIN;
 	} else {
 		/* mark all indexes as stale */
-		for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+		for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
 			qsd->qsd_type_array[qtype]->qqi_glb_uptodate = false;
 			qsd->qsd_type_array[qtype]->qqi_slv_uptodate = false;
 		}
@@ -176,45 +227,55 @@ static int lprocfs_qsd_wr_force_reint(struct file *file, const char *buffer,
 		return rc;
 
 	/* kick off reintegration */
-	for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+	for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
 		rc = qsd_start_reint_thread(qsd->qsd_type_array[qtype]);
 		if (rc)
 			break;
 	}
 	return rc == 0 ? count : rc;
 }
+LPROC_SEQ_FOPS_WR_ONLY(qsd, force_reint);
 
-static int lprocfs_qsd_rd_timeout(char *page, char **start, off_t off,
-				  int count, int *eof, void *data)
+static int qsd_timeout_seq_show(struct seq_file *m, void *data)
 {
-	struct qsd_instance	*qsd = (struct qsd_instance *)data;
+	struct qsd_instance *qsd = m->private;
 	LASSERT(qsd != NULL);
 
-	return snprintf(page, count, "%d\n", qsd_wait_timeout(qsd));
+	seq_printf(m, "%d\n", qsd_wait_timeout(qsd));
+	return 0;
 }
 
-static int lprocfs_qsd_wr_timeout(struct file *file, const char *buffer,
-				  unsigned long count, void *data)
+static ssize_t
+qsd_timeout_seq_write(struct file *file, const char __user *buffer,
+			size_t count, loff_t *off)
 {
-	struct qsd_instance	*qsd = (struct qsd_instance *)data;
-	int			 timeout, rc;
-	LASSERT(qsd != NULL);
+	struct seq_file *m = file->private_data;
+	struct qsd_instance *qsd = m->private;
+	time64_t timeout;
+	int rc;
 
-	rc = lprocfs_write_helper(buffer, count, &timeout);
+	LASSERT(qsd != NULL);
+	rc = kstrtoll_from_user(buffer, count, 0, &timeout);
 	if (rc)
 		return rc;
+
 	if (timeout < 0)
 		return -EINVAL;
 
 	qsd->qsd_timeout = timeout;
 	return count;
 }
+LPROC_SEQ_FOPS(qsd_timeout);
 
 static struct lprocfs_vars lprocfs_quota_qsd_vars[] = {
-	{ "info", lprocfs_qsd_rd_state, 0, 0},
-	{ "enabled", lprocfs_qsd_rd_enabled, 0, 0},
-	{ "force_reint", 0, lprocfs_qsd_wr_force_reint, 0},
-	{ "timeout", lprocfs_qsd_rd_timeout, lprocfs_qsd_wr_timeout, 0},
+	{ .name	=	"info",
+	  .fops	=	&qsd_state_fops		},
+	{ .name	=	"enabled",
+	  .fops	=	&qsd_enabled_fops	},
+	{ .name	=	"force_reint",
+	  .fops	=	&qsd_force_reint_fops	},
+	{ .name	=	"timeout",
+	  .fops	=	&qsd_timeout_fops	},
 	{ NULL }
 };
 
@@ -235,8 +296,6 @@ static int qsd_conn_callback(void *data)
 	/* qsd_exp should now be valid */
 	LASSERT(qsd->qsd_exp);
 
-	/* grab reference on namespace */
-	ldlm_namespace_get(class_exp2obd(qsd->qsd_exp)->obd_namespace);
 	qsd->qsd_ns = class_exp2obd(qsd->qsd_exp)->obd_namespace;
 
 	write_lock(&qsd->qsd_lock);
@@ -251,9 +310,18 @@ static int qsd_conn_callback(void *data)
 	 * reintegration procedure (i.e. global lock enqueue and slave
 	 * index transfer) since the space usage reconciliation (i.e.
 	 * step 3) will have to wait for qsd_start() to be called */
-	for (type = USRQUOTA; type < MAXQUOTAS; type++) {
+	for (type = USRQUOTA; type < LL_MAXQUOTAS; type++) {
 		struct qsd_qtype_info *qqi = qsd->qsd_type_array[type];
-		cfs_waitq_signal(&qqi->qqi_reint_thread.t_ctl_waitq);
+		struct task_struct *t;
+
+		/* qqi_reint_task can be set to NULL at any time,
+		 * so we need to be careful.
+		 */
+		rcu_read_lock();
+		t = rcu_dereference(qqi->qqi_reint_task);
+		if (t)
+			wake_up_process(t);
+		rcu_read_unlock();
 	}
 
 	RETURN(0);
@@ -273,6 +341,7 @@ static void qsd_qtype_fini(const struct lu_env *env, struct qsd_instance *qsd,
 			   int qtype)
 {
 	struct qsd_qtype_info	*qqi;
+	int repeat = 0;
 	ENTRY;
 
 	if (qsd->qsd_type_array[qtype] == NULL)
@@ -281,8 +350,8 @@ static void qsd_qtype_fini(const struct lu_env *env, struct qsd_instance *qsd,
 	qsd->qsd_type_array[qtype] = NULL;
 
 	/* all deferred work lists should be empty */
-	LASSERT(cfs_list_empty(&qqi->qqi_deferred_glb));
-	LASSERT(cfs_list_empty(&qqi->qqi_deferred_slv));
+	LASSERT(list_empty(&qqi->qqi_deferred_glb));
+	LASSERT(list_empty(&qqi->qqi_deferred_slv));
 
 	/* shutdown lquota site */
 	if (qqi->qqi_site != NULL && !IS_ERR(qqi->qqi_site)) {
@@ -290,26 +359,48 @@ static void qsd_qtype_fini(const struct lu_env *env, struct qsd_instance *qsd,
 		qqi->qqi_site = NULL;
 	}
 
+	/* The qqi may still be holding by global locks which are being
+	 * canceled asynchronously (LU-4365), see the following steps:
+	 *
+	 * - On server umount, we try to clear all quota locks first by
+	 *   disconnecting LWP (which will invalidate import and cleanup
+	 *   all locks on it), however, if quota reint process is holding
+	 *   the global lock for reintegration at that time, global lock
+	 *   will fail to be cleared on LWP disconnection.
+	 *
+	 * - Umount process goes on and stops reint process, the global
+	 *   lock will be dropped on reint process exit, however, the lock
+	 *   cancel in done in asynchronous way, so the
+	 *   qsd_glb_blocking_ast() might haven't been called yet when we
+	 *   get here.
+	 */
+	while (atomic_read(&qqi->qqi_ref) > 1) {
+		CDEBUG(D_QUOTA, "qqi reference count %u, repeat: %d\n",
+		       atomic_read(&qqi->qqi_ref), repeat);
+		repeat++;
+		schedule_timeout_interruptible(cfs_time_seconds(1));
+	}
+
 	/* by now, all qqi users should have gone away */
-	LASSERT(cfs_atomic_read(&qqi->qqi_ref) == 1);
+	LASSERT(atomic_read(&qqi->qqi_ref) == 1);
 	lu_ref_fini(&qqi->qqi_reference);
 
 	/* release accounting object */
 	if (qqi->qqi_acct_obj != NULL && !IS_ERR(qqi->qqi_acct_obj)) {
-		lu_object_put(env, &qqi->qqi_acct_obj->do_lu);
+		dt_object_put(env, qqi->qqi_acct_obj);
 		qqi->qqi_acct_obj = NULL;
 	}
 
 	/* release slv index */
 	if (qqi->qqi_slv_obj != NULL && !IS_ERR(qqi->qqi_slv_obj)) {
-		lu_object_put(env, &qqi->qqi_slv_obj->do_lu);
+		dt_object_put(env, qqi->qqi_slv_obj);
 		qqi->qqi_slv_obj = NULL;
 		qqi->qqi_slv_ver = 0;
 	}
 
 	/* release global index */
 	if (qqi->qqi_glb_obj != NULL && !IS_ERR(qqi->qqi_glb_obj)) {
-		lu_object_put(env, &qqi->qqi_glb_obj->do_lu);
+		dt_object_put(env, qqi->qqi_glb_obj);
 		qqi->qqi_glb_obj = NULL;
 		qqi->qqi_glb_ver = 0;
 	}
@@ -318,6 +409,40 @@ static void qsd_qtype_fini(const struct lu_env *env, struct qsd_instance *qsd,
 	EXIT;
 }
 
+static const char *qtype2acct_name(int qtype)
+{
+	static char unknown[24];
+
+	switch (qtype) {
+	case USRQUOTA:
+		return "acct_user";
+	case GRPQUOTA:
+		return "acct_group";
+	case PRJQUOTA:
+		return "acct_project";
+	}
+
+	snprintf(unknown, sizeof(unknown), "acct_unknown_%u", qtype);
+	return unknown;
+}
+
+static const char *qtype2glb_name(int qtype)
+{
+	static char unknown[24];
+
+	switch (qtype) {
+	case USRQUOTA:
+		return "limit_user";
+	case GRPQUOTA:
+		return "limit_group";
+	case PRJQUOTA:
+		return "limit_project";
+	}
+
+	snprintf(unknown, sizeof(unknown), "acct_unknown_%u", qtype);
+	return unknown;
+}
+
 /*
  * Allocate and initialize a qsd_qtype_info structure for quota type \qtype.
  * This opens the accounting object and initializes the proc file.
@@ -347,31 +472,28 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
 	if (qqi == NULL)
 		RETURN(-ENOMEM);
 	qsd->qsd_type_array[qtype] = qqi;
-	cfs_atomic_set(&qqi->qqi_ref, 1); /* referenced from qsd */
+	atomic_set(&qqi->qqi_ref, 1); /* referenced from qsd */
 
 	/* set backpointer and other parameters */
 	qqi->qqi_qsd   = qsd;
 	qqi->qqi_qtype = qtype;
 	lu_ref_init(&qqi->qqi_reference);
-	lquota_generate_fid(&qqi->qqi_fid, qsd->qsd_pool_id, QSD_RES_TYPE(qsd),
-			    qtype);
 	qqi->qqi_glb_uptodate = false;
 	qqi->qqi_slv_uptodate = false;
 	qqi->qqi_reint        = false;
-	cfs_waitq_init(&qqi->qqi_reint_thread.t_ctl_waitq);
-	thread_set_flags(&qqi->qqi_reint_thread, SVC_STOPPED);
-	CFS_INIT_LIST_HEAD(&qqi->qqi_deferred_glb);
-	CFS_INIT_LIST_HEAD(&qqi->qqi_deferred_slv);
+	INIT_LIST_HEAD(&qqi->qqi_deferred_glb);
+	INIT_LIST_HEAD(&qqi->qqi_deferred_slv);
+	lquota_generate_fid(&qqi->qqi_fid, QSD_RES_TYPE(qsd), qtype);
 
 	/* open accounting object */
 	LASSERT(qqi->qqi_acct_obj == NULL);
 	qqi->qqi_acct_obj = acct_obj_lookup(env, qsd->qsd_dev, qtype);
 	if (IS_ERR(qqi->qqi_acct_obj)) {
-		CDEBUG(D_QUOTA, "%s: no %s space accounting support rc:%ld\n",
-		       qsd->qsd_svname, QTYPE_NAME(qtype),
+		CDEBUG(D_QUOTA, "%s: no %s space accounting support: rc = %ld\n",
+		       qsd->qsd_svname, qtype_name(qtype),
 		       PTR_ERR(qqi->qqi_acct_obj));
 		qqi->qqi_acct_obj = NULL;
-		qsd->qsd_acct_failed = true;
+		qqi->qqi_acct_failed = true;
 	}
 
 	/* open global index copy */
@@ -411,8 +533,7 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
 	}
 
 	/* register proc entry for accounting & global index copy objects */
-	rc = lprocfs_seq_create(qsd->qsd_proc,
-				qtype == USRQUOTA ? "acct_user" : "acct_group",
+	rc = lprocfs_seq_create(qsd->qsd_proc, qtype2acct_name(qtype),
 				0444, &lprocfs_quota_seq_fops,
 				qqi->qqi_acct_obj);
 	if (rc) {
@@ -421,8 +542,7 @@ static int qsd_qtype_init(const struct lu_env *env, struct qsd_instance *qsd,
 		GOTO(out, rc);
 	}
 
-	rc = lprocfs_seq_create(qsd->qsd_proc,
-				qtype == USRQUOTA ? "limit_user" : "limit_group",
+	rc = lprocfs_seq_create(qsd->qsd_proc, qtype2glb_name(qtype),
 				0444, &lprocfs_quota_seq_fops,
 				qqi->qqi_glb_obj);
 	if (rc) {
@@ -469,39 +589,37 @@ void qsd_fini(const struct lu_env *env, struct qsd_instance *qsd)
 	qsd_stop_upd_thread(qsd);
 
 	/* shutdown the reintegration threads */
-	for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+	for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
 		if (qsd->qsd_type_array[qtype] == NULL)
 			continue;
 		qsd_stop_reint_thread(qsd->qsd_type_array[qtype]);
 	}
 
-	/* release reference on namespace */
 	if (qsd->qsd_ns != NULL) {
-		ldlm_namespace_put(qsd->qsd_ns);
 		qsd->qsd_ns = NULL;
 	}
 
-	/* free per-quota type data */
-	for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++)
-		qsd_qtype_fini(env, qsd, qtype);
-
-	/* deregister connection to the quota master */
-	qsd->qsd_exp_valid = false;
-	lustre_deregister_lwp_item(&qsd->qsd_exp);
-
 	/* release per-filesystem information */
 	if (qsd->qsd_fsinfo != NULL) {
-		down(&qsd->qsd_fsinfo->qfs_sem);
+		mutex_lock(&qsd->qsd_fsinfo->qfs_mutex);
 		/* remove from the list of fsinfo */
-		cfs_list_del_init(&qsd->qsd_link);
-		up(&qsd->qsd_fsinfo->qfs_sem);
+		list_del_init(&qsd->qsd_link);
+		mutex_unlock(&qsd->qsd_fsinfo->qfs_mutex);
 		qsd_put_fsinfo(qsd->qsd_fsinfo);
 		qsd->qsd_fsinfo = NULL;
 	}
 
+	/* free per-quota type data */
+	for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++)
+		qsd_qtype_fini(env, qsd, qtype);
+
+	/* deregister connection to the quota master */
+	qsd->qsd_exp_valid = false;
+	lustre_deregister_lwp_item(&qsd->qsd_exp);
+
 	/* release quota root directory */
 	if (qsd->qsd_root != NULL) {
-		lu_object_put(env, &qsd->qsd_root->do_lu);
+		dt_object_put(env, qsd->qsd_root);
 		qsd->qsd_root = NULL;
 	}
 
@@ -533,7 +651,8 @@ EXPORT_SYMBOL(qsd_fini);
  */
 struct qsd_instance *qsd_init(const struct lu_env *env, char *svname,
 			      struct dt_device *dev,
-			      cfs_proc_dir_entry_t *osd_proc)
+			      struct proc_dir_entry *osd_proc,
+			      bool is_md, bool excl)
 {
 	struct qsd_thread_info	*qti = qsd_info(env);
 	struct qsd_instance	*qsd;
@@ -552,28 +671,26 @@ struct qsd_instance *qsd_init(const struct lu_env *env, char *svname,
 
 	/* generic initializations */
 	rwlock_init(&qsd->qsd_lock);
-	CFS_INIT_LIST_HEAD(&qsd->qsd_link);
-	thread_set_flags(&qsd->qsd_upd_thread, SVC_STOPPED);
-	cfs_waitq_init(&qsd->qsd_upd_thread.t_ctl_waitq);
-	CFS_INIT_LIST_HEAD(&qsd->qsd_upd_list);
+	INIT_LIST_HEAD(&qsd->qsd_link);
+	INIT_LIST_HEAD(&qsd->qsd_upd_list);
 	spin_lock_init(&qsd->qsd_adjust_lock);
-	CFS_INIT_LIST_HEAD(&qsd->qsd_adjust_list);
+	INIT_LIST_HEAD(&qsd->qsd_adjust_list);
 	qsd->qsd_prepared = false;
 	qsd->qsd_started = false;
+	qsd->qsd_is_md = is_md;
+	qsd->qsd_updating = false;
+	qsd->qsd_exclusive = excl;
 
 	/* copy service name */
-	strncpy(qsd->qsd_svname, svname, MAX_OBD_NAME);
+	if (strlcpy(qsd->qsd_svname, svname, sizeof(qsd->qsd_svname))
+	    >= sizeof(qsd->qsd_svname))
+		GOTO(out, rc = -E2BIG);
 
 	/* grab reference on osd device */
 	lu_device_get(&dev->dd_lu_dev);
 	lu_ref_add(&dev->dd_lu_dev.ld_reference, "qsd", qsd);
 	qsd->qsd_dev = dev;
 
-	/* we only support pool ID 0 (default data or metadata pool) for the
-	 * time being. A different pool ID could be assigned to this target via
-	 * the configuration log in the future */
-	qsd->qsd_pool_id  = 0;
-
 	/* get fsname from svname */
 	rc = server_name2fsname(svname, qti->qti_buf, NULL);
 	if (rc) {
@@ -589,13 +706,23 @@ struct qsd_instance *qsd_init(const struct lu_env *env, char *svname,
 	}
 
 	/* add in the list of lquota_fsinfo */
-	down(&qsd->qsd_fsinfo->qfs_sem);
+	mutex_lock(&qsd->qsd_fsinfo->qfs_mutex);
 	list_add_tail(&qsd->qsd_link, &qsd->qsd_fsinfo->qfs_qsd_list);
-	up(&qsd->qsd_fsinfo->qfs_sem);
+	mutex_unlock(&qsd->qsd_fsinfo->qfs_mutex);
 
 	/* register procfs directory */
-	qsd->qsd_proc = lprocfs_register(QSD_DIR, osd_proc,
-					 lprocfs_quota_qsd_vars, qsd);
+	if (qsd->qsd_is_md)
+		qsd->qsd_proc = lprocfs_register(QSD_DIR_MD, osd_proc,
+						 lprocfs_quota_qsd_vars, qsd);
+	else
+		qsd->qsd_proc = lprocfs_register(QSD_DIR_DT, osd_proc,
+						 lprocfs_quota_qsd_vars, qsd);
+
+	if (type == LDD_F_SV_TYPE_MDT && qsd->qsd_is_md)
+		lprocfs_add_symlink(QSD_DIR, osd_proc, "./%s", QSD_DIR_MD);
+	else if (type == LDD_F_SV_TYPE_OST && !qsd->qsd_is_md)
+		lprocfs_add_symlink(QSD_DIR, osd_proc, "./%s", QSD_DIR_DT);
+
 	if (IS_ERR(qsd->qsd_proc)) {
 		rc = PTR_ERR(qsd->qsd_proc);
 		qsd->qsd_proc = NULL;
@@ -648,12 +775,10 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd)
 
 	/* Record whether this qsd instance is managing quota enforcement for a
 	 * MDT (i.e. inode quota) or OST (block quota) */
-	if (lu_device_is_md(qsd->qsd_dev->dd_lu_dev.ld_site->ls_top_dev)) {
-		qsd->qsd_is_md = true;
+	if (qsd->qsd_is_md)
 		qsd->qsd_sync_threshold = LQUOTA_LEAST_QUNIT(LQUOTA_RES_MD);
-	} else {
+	else
 		qsd->qsd_sync_threshold = LQUOTA_LEAST_QUNIT(LQUOTA_RES_DT);
-	}
 
 	/* look-up on-disk directory for the quota slave */
 	qsd->qsd_root = lquota_disk_dir_find_create(env, qsd->qsd_dev, NULL,
@@ -667,7 +792,7 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd)
 	}
 
 	/* initialize per-quota type data */
-	for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+	for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
 		rc = qsd_qtype_init(env, qsd, qtype);
 		if (rc)
 			RETURN(rc);
@@ -678,24 +803,27 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd)
 	qsd->qsd_prepared = true;
 	write_unlock(&qsd->qsd_lock);
 
+	if (qsd->qsd_dev->dd_rdonly)
+		RETURN(0);
+
 	/* start reintegration thread for each type, if required */
-	for (qtype = USRQUOTA; qtype < MAXQUOTAS; qtype++) {
+	for (qtype = USRQUOTA; qtype < LL_MAXQUOTAS; qtype++) {
 		struct qsd_qtype_info	*qqi = qsd->qsd_type_array[qtype];
 
-		if (qsd_type_enabled(qsd, qtype) && qsd->qsd_acct_failed) {
+		if (qsd_type_enabled(qsd, qtype) &&
+		    qqi->qqi_acct_failed) {
 			LCONSOLE_ERROR("%s: can't enable quota enforcement "
 				       "since space accounting isn't functional"
 				       ". Please run tunefs.lustre --quota on "
 				       "an unmounted filesystem if not done "
 				       "already\n", qsd->qsd_svname);
-			break;
+			continue;
 		}
 
 		rc = qsd_start_reint_thread(qqi);
 		if (rc) {
-			CERROR("%s: failed to start reint thread for type %s "
-			       "(%d)\n", qsd->qsd_svname, QTYPE_NAME(qtype),
-			       rc);
+			CERROR("%s: failed to start reint thread for type %s: rc = %d\n",
+				qsd->qsd_svname, qtype_name(qtype), rc);
 			RETURN(rc);
 		}
 	}
@@ -709,7 +837,8 @@ int qsd_prepare(const struct lu_env *env, struct qsd_instance *qsd)
 	}
 
 	/* generate osp name */
-	rc = tgt_name2lwpname((char *)qsd->qsd_svname, qti->qti_buf);
+	rc = tgt_name2lwp_name(qsd->qsd_svname, qti->qti_buf,
+			       MTI_NAME_MAXLEN, 0);
 	if (rc) {
 		CERROR("%s: failed to generate ospname (%d)\n",
 		       qsd->qsd_svname, rc);
@@ -766,9 +895,18 @@ int qsd_start(const struct lu_env *env, struct qsd_instance *qsd)
 
 	/* Trigger the 3rd step of reintegration: If usage > granted, acquire
 	 * up to usage; If usage < granted, release down to usage.  */
-	for (type = USRQUOTA; type < MAXQUOTAS; type++) {
+	for (type = USRQUOTA; type < LL_MAXQUOTAS; type++) {
 		struct qsd_qtype_info	*qqi = qsd->qsd_type_array[type];
-		cfs_waitq_signal(&qqi->qqi_reint_thread.t_ctl_waitq);
+		struct task_struct *t;
+
+		/* qqi_reint_task can be set to NULL at any time,
+		 * so we need to be careful.
+		 */
+		rcu_read_lock();
+		t = rcu_dereference(qqi->qqi_reint_task);
+		if (t)
+			wake_up_process(t);
+		rcu_read_unlock();
 	}
 
 	RETURN(rc);