diff --git a/[refs] b/[refs]
index 65cc3bd9db44..a931c13a1df9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06452eb0538827d2158945d20e3d33e359884437
+refs/heads/master: ad917e7f821855a2f223131bb6c90ca6c9240bf3
diff --git a/trunk/fs/dlm/config.c b/trunk/fs/dlm/config.c
index 7d58d5b112b5..76feb4b60fa6 100644
--- a/trunk/fs/dlm/config.c
+++ b/trunk/fs/dlm/config.c
@@ -138,8 +138,9 @@ static ssize_t cluster_cluster_name_read(struct dlm_cluster *cl, char *buf)
 static ssize_t cluster_cluster_name_write(struct dlm_cluster *cl,
 					  const char *buf, size_t len)
 {
-	strncpy(dlm_config.ci_cluster_name, buf, DLM_LOCKSPACE_LEN);
-	strncpy(cl->cl_cluster_name, buf, DLM_LOCKSPACE_LEN);
+	strlcpy(dlm_config.ci_cluster_name, buf,
+				sizeof(dlm_config.ci_cluster_name));
+	strlcpy(cl->cl_cluster_name, buf, sizeof(cl->cl_cluster_name));
 	return len;
 }