X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_config.c;h=6b18cb771f5c9bba48d902da5b932d1e6165349b;hb=79c8abecdac052e3e00251547cc500f2cba742ab;hp=08cbeb6155aaa299054b153be860cc37d36d04e0;hpb=1398ed438568d2a07f09a59da8b7b23ff04ed4ea;p=fs%2Flustre-release.git

diff --git a/lustre/quota/qsd_config.c b/lustre/quota/qsd_config.c
index 08cbeb6..6b18cb7 100644
--- a/lustre/quota/qsd_config.c
+++ b/lustre/quota/qsd_config.c
@@ -31,11 +31,11 @@
 #define DEBUG_SUBSYSTEM S_LQUOTA
 
 #include <obd_class.h>
-#include <lustre_param.h>
+#include <uapi/linux/lustre/lustre_param.h>
 
 #include "qsd_internal.h"
 
-static struct list_head qfs_list = LIST_HEAD_INIT(qfs_list);
+static LIST_HEAD(qfs_list);
 /* protect the qfs_list */
 static DEFINE_SPINLOCK(qfs_list_lock);
 
@@ -119,35 +119,13 @@ out:
 	RETURN(qfs);
 }
 
-/*
- * Quota configuration handlers in charge of processing all per-filesystem quota
- * parameters set via conf_param.
- *
- * \param lcfg - quota configuration log to be processed
- */
-int qsd_process_config(struct lustre_cfg *lcfg)
+int qsd_config(char *valstr, char *fsname, int pool)
 {
-	struct qsd_fsinfo	*qfs;
-	char			*fsname = lustre_cfg_string(lcfg, 0);
-	char			*cfgstr = lustre_cfg_string(lcfg, 1);
-	char			*keystr, *valstr;
-	int			 rc, pool, enabled = 0;
-	bool			 reint = false;
-	ENTRY;
-
-	CDEBUG(D_QUOTA, "processing quota parameter: fs:%s cfgstr:%s\n", fsname,
-	       cfgstr);
-
-	if (class_match_param(cfgstr, PARAM_QUOTA, &keystr) != 0)
-		RETURN(-EINVAL);
-
-	if (!class_match_param(keystr, QUOTA_METAPOOL_NAME, &valstr))
-		pool = LQUOTA_RES_MD;
-	else if (!class_match_param(keystr, QUOTA_DATAPOOL_NAME, &valstr))
-		pool = LQUOTA_RES_DT;
-	else
-		RETURN(-EINVAL);
+	struct qsd_fsinfo *qfs;
+	int rc, enabled = 0, old_enabled = 0;
+	bool reint = false;
 
+	ENTRY;
 	qfs = qsd_get_fsinfo(fsname, 0);
 	if (qfs == NULL) {
 		CERROR("failed to find quota filesystem information for %s\n",
@@ -156,11 +134,11 @@ int qsd_process_config(struct lustre_cfg *lcfg)
 	}
 
 	if (strchr(valstr, 'u'))
-		enabled |= 1 << USRQUOTA;
+		enabled |= BIT(USRQUOTA);
 	if (strchr(valstr, 'g'))
-		enabled |= 1 << GRPQUOTA;
+		enabled |= BIT(GRPQUOTA);
 	if (strchr(valstr, 'p'))
-		enabled |= 1 << PRJQUOTA;
+		enabled |= BIT(PRJQUOTA);
 
 	mutex_lock(&qfs->qfs_mutex);
 	if (qfs->qfs_enabled[pool - LQUOTA_FIRST_RES] == enabled)
@@ -170,6 +148,7 @@ int qsd_process_config(struct lustre_cfg *lcfg)
 	if ((qfs->qfs_enabled[pool - LQUOTA_FIRST_RES] & enabled) != enabled)
 		reint = true;
 
+	old_enabled = qfs->qfs_enabled[pool - LQUOTA_FIRST_RES];
 	qfs->qfs_enabled[pool - LQUOTA_FIRST_RES] = enabled;
 
 	/* trigger reintegration for all qsd */
@@ -192,6 +171,12 @@ int qsd_process_config(struct lustre_cfg *lcfg)
 
 			for (type = USRQUOTA; type < LL_MAXQUOTAS; type++) {
 				qqi = qsd->qsd_type_array[type];
+				/* only trigger reintegration if this
+				 * type of quota is not enabled before */
+				if ((old_enabled & BIT(type)) ||
+				    !(enabled & BIT(type)))
+					continue;
+
 				if (qqi->qqi_acct_failed) {
 					LCONSOLE_ERROR("%s: can't enable quota "
 						       "enforcement since space "
@@ -211,3 +196,33 @@ out:
 	qsd_put_fsinfo(qfs);
 	RETURN(0);
 }
+
+/*
+ * Quota configuration handlers in charge of processing all per-filesystem quota
+ * parameters set via conf_param.
+ *
+ * \param lcfg - quota configuration log to be processed
+ */
+int qsd_process_config(struct lustre_cfg *lcfg)
+{
+	char *fsname = lustre_cfg_string(lcfg, 0);
+	char *cfgstr = lustre_cfg_string(lcfg, 1);
+	char *keystr, *valstr;
+	int pool;
+
+	ENTRY;
+	CDEBUG(D_QUOTA, "processing quota parameter: fs:%s cfgstr:%s\n", fsname,
+	       cfgstr);
+
+	if (class_match_param(cfgstr, PARAM_QUOTA, &keystr) != 0)
+		RETURN(-EINVAL);
+
+	if (!class_match_param(keystr, QUOTA_METAPOOL_NAME, &valstr))
+		pool = LQUOTA_RES_MD;
+	else if (!class_match_param(keystr, QUOTA_DATAPOOL_NAME, &valstr))
+		pool = LQUOTA_RES_DT;
+	else
+		RETURN(-EINVAL);
+
+	return qsd_config(valstr, fsname, pool);
+}