X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fnodemap_storage.c;h=6951db02e2bc9feafd39619357b51ff78eea7821;hb=refs%2Fchanges%2F11%2F37111%2F5;hp=65a8884fd7206dab3a4a4c756fa22f49878ca27e;hpb=942a9853f7b4c6fe22729468f1802ab782087e4e;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/nodemap_storage.c b/lustre/ptlrpc/nodemap_storage.c
index 65a8884..6951db0 100644
--- a/lustre/ptlrpc/nodemap_storage.c
+++ b/lustre/ptlrpc/nodemap_storage.c
@@ -87,9 +87,9 @@ static void nodemap_cluster_key_init(struct nodemap_key *nk, unsigned int nm_id)
 static void nodemap_cluster_rec_init(union nodemap_rec *nr,
 				     const struct lu_nodemap *nodemap)
 {
-	CLASSERT(sizeof(nr->ncr.ncr_name) == sizeof(nodemap->nm_name));
+	BUILD_BUG_ON(sizeof(nr->ncr.ncr_name) != sizeof(nodemap->nm_name));
 
-	strncpy(nr->ncr.ncr_name, nodemap->nm_name, sizeof(nodemap->nm_name));
+	strncpy(nr->ncr.ncr_name, nodemap->nm_name, sizeof(nr->ncr.ncr_name));
 	nr->ncr.ncr_squash_uid = cpu_to_le32(nodemap->nm_squash_uid);
 	nr->ncr.ncr_squash_gid = cpu_to_le32(nodemap->nm_squash_gid);
 	nr->ncr.ncr_flags = cpu_to_le32(
@@ -249,7 +249,7 @@ static int nodemap_idx_insert(const struct lu_env *env,
 	struct dt_device *dev = lu2dt_dev(idx->do_lu.lo_dev);
 	int rc;
 
-	CLASSERT(sizeof(union nodemap_rec) == 32);
+	BUILD_BUG_ON(sizeof(union nodemap_rec) != 32);
 
 	th = dt_trans_create(env, dev);
 
@@ -273,7 +273,7 @@ static int nodemap_idx_insert(const struct lu_env *env,
 	dt_write_lock(env, idx, 0);
 
 	rc = dt_insert(env, idx, (const struct dt_rec *)nr,
-		       (const struct dt_key *)nk, th, 1);
+		       (const struct dt_key *)nk, th);
 
 	nodemap_inc_version(env, idx, th);
 	dt_write_unlock(env, idx);
@@ -321,7 +321,7 @@ static int nodemap_idx_update(const struct lu_env *env,
 		GOTO(out_lock, rc);
 
 	rc = dt_insert(env, idx, (const struct dt_rec *)nr,
-		       (const struct dt_key *)nk, th, 1);
+		       (const struct dt_key *)nk, th);
 	if (rc != 0)
 		GOTO(out_lock, rc);
 
@@ -671,7 +671,7 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
 
 	ENTRY;
 
-	CLASSERT(sizeof(union nodemap_rec) == 32);
+	BUILD_BUG_ON(sizeof(union nodemap_rec) != 32);
 
 	nodemap_id = le32_to_cpu(key->nk_nodemap_id);
 	type = nodemap_get_key_type(key);
@@ -713,7 +713,9 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
 			      " nodemap_id=%d. nodemap config file corrupt?\n",
 			      nodemap_id);
 		break;
-	case NODEMAP_CLUSTER_IDX:
+	case NODEMAP_CLUSTER_IDX: {
+		struct lu_nodemap *old_nm = NULL;
+
 		nodemap = cfs_hash_lookup(config->nmc_nodemap_hash,
 					  rec->ncr.ncr_name);
 		if (nodemap == NULL) {
@@ -757,6 +759,17 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
 		nodemap->nmf_enable_audit =
 					flags & NM_FL_ENABLE_AUDIT;
 
+		/* The fileset should be saved otherwise it will be empty
+		 * every time in case of "NODEMAP_CLUSTER_IDX". */
+		mutex_lock(&active_config_lock);
+		old_nm = nodemap_lookup(rec->ncr.ncr_name);
+		if (!IS_ERR(old_nm) && old_nm->nm_fileset[0] != '\0')
+			strlcpy(nodemap->nm_fileset, old_nm->nm_fileset,
+				sizeof(nodemap->nm_fileset));
+		mutex_unlock(&active_config_lock);
+		if (!IS_ERR(old_nm))
+			nodemap_putref(old_nm);
+
 		if (*recent_nodemap == NULL) {
 			*recent_nodemap = nodemap;
 			INIT_LIST_HEAD(&nodemap->nm_list);
@@ -766,6 +779,7 @@ static int nodemap_process_keyrec(struct nodemap_config *config,
 		}
 		nodemap_putref(nodemap);
 		break;
+	}
 	case NODEMAP_RANGE_IDX:
 		nid[0] = le64_to_cpu(rec->nrr.nrr_start_nid);
 		nid[1] = le64_to_cpu(rec->nrr.nrr_end_nid);
@@ -1446,12 +1460,12 @@ EXPORT_SYMBOL(nodemap_index_read);
 int nodemap_get_config_req(struct obd_device *mgs_obd,
 			   struct ptlrpc_request *req)
 {
+	const struct ptlrpc_bulk_frag_ops *frag_ops = &ptlrpc_bulk_kiov_pin_ops;
 	struct mgs_config_body *body;
 	struct mgs_config_res *res;
 	struct lu_rdpg rdpg;
 	struct idx_info nodemap_ii;
 	struct ptlrpc_bulk_desc *desc;
-	struct l_wait_info lwi;
 	struct tg_export_data *rqexp_ted = &req->rq_export->exp_target_data;
 	int i;
 	int page_count;
@@ -1509,18 +1523,17 @@ int nodemap_get_config_req(struct obd_device *mgs_obd,
 	desc = ptlrpc_prep_bulk_exp(req, page_count, 1,
 				    PTLRPC_BULK_PUT_SOURCE |
 					PTLRPC_BULK_BUF_KIOV,
-				    MGS_BULK_PORTAL,
-				    &ptlrpc_bulk_kiov_pin_ops);
+				    MGS_BULK_PORTAL, frag_ops);
 	if (desc == NULL)
 		GOTO(out, rc = -ENOMEM);
 
 	for (i = 0; i < page_count && bytes > 0; i++) {
-		ptlrpc_prep_bulk_page_pin(desc, rdpg.rp_pages[i], 0,
-					  min_t(int, bytes, PAGE_SIZE));
+		frag_ops->add_kiov_frag(desc, rdpg.rp_pages[i], 0,
+					min_t(int, bytes, PAGE_SIZE));
 		bytes -= PAGE_SIZE;
 	}
 
-	rc = target_bulk_io(req->rq_export, desc, &lwi);
+	rc = target_bulk_io(req->rq_export, desc);
 	ptlrpc_free_bulk(desc);
 
 out: