X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_coordinator.c;h=970d93322614e4c9057012cf18376aafff539727;hb=30165c4024f8a1ee316fb192005d9b2a8b89d0b8;hp=1617eeb24626062437b94477a607a9d6783bcea6;hpb=90636ff53d8d2d714a7591c4bb9a75a7c69f997f;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_coordinator.c b/lustre/mdt/mdt_coordinator.c
index 1617eeb..970d933 100644
--- a/lustre/mdt/mdt_coordinator.c
+++ b/lustre/mdt/mdt_coordinator.c
@@ -227,9 +227,8 @@ static int mdt_coordinator_cb(const struct lu_env *env,
 				RETURN(-ENOMEM);
 			}
 			hal->hal_version = HAL_VERSION;
-			strncpy(hal->hal_fsname, hsd->fs_name,
-				MTI_NAME_MAXLEN);
-			hal->hal_fsname[MTI_NAME_MAXLEN] = '\0';
+			strlcpy(hal->hal_fsname, hsd->fs_name,
+				MTI_NAME_MAXLEN + 1);
 			hal->hal_compound_id = larr->arr_compound_id;
 			hal->hal_archive_id = larr->arr_archive_id;
 			hal->hal_flags = larr->arr_flags;
@@ -869,9 +868,9 @@ int mdt_hsm_cdt_init(struct mdt_device *mdt)
 	init_rwsem(&cdt->cdt_request_lock);
 	mutex_init(&cdt->cdt_restore_lock);
 
-	CFS_INIT_LIST_HEAD(&cdt->cdt_requests);
-	CFS_INIT_LIST_HEAD(&cdt->cdt_agents);
-	CFS_INIT_LIST_HEAD(&cdt->cdt_restore_hdl);
+	INIT_LIST_HEAD(&cdt->cdt_requests);
+	INIT_LIST_HEAD(&cdt->cdt_agents);
+	INIT_LIST_HEAD(&cdt->cdt_restore_hdl);
 
 	rc = lu_env_init(&cdt->cdt_env, LCT_MD_THREAD);
 	if (rc < 0)