X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flmv%2Flmv_obd.c;h=2df8aa3799b35b34ddc3b0dfe0335aa0953b0e1a;hb=6601661f96325b4971d0d1cb0be0fa01cc2ddc97;hp=b04d5a3ea5bd65b7da8ac07d9968f9bc0b7fa030;hpb=66919f2b687f8b15679e6ff4e22a3f66f7d1c13a;p=fs%2Flustre-release.git

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index b04d5a3..2df8aa3 100644
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -660,6 +660,7 @@ repeat_fid2path:
 	if (remote_gf != NULL) {
 		struct getinfo_fid2path *ori_gf;
 		char *ptr;
+		int len;
 
 		ori_gf = (struct getinfo_fid2path *)karg;
 		if (strlen(ori_gf->gf_u.gf_path) + 1 +
@@ -668,13 +669,12 @@ repeat_fid2path:
 
 		ptr = ori_gf->gf_u.gf_path;
 
-		memmove(ptr + strlen(gf->gf_u.gf_path) + 1, ptr,
-			strlen(ori_gf->gf_u.gf_path));
-
-		strncpy(ptr, gf->gf_u.gf_path,
-			strlen(gf->gf_u.gf_path));
-		ptr += strlen(gf->gf_u.gf_path);
-		*ptr = '/';
+		len = strlen(gf->gf_u.gf_path);
+		/* move the current path to the right to release space
+		 * for closer-to-root part */
+		memmove(ptr + len + 1, ptr, strlen(ori_gf->gf_u.gf_path));
+		memcpy(ptr, gf->gf_u.gf_path, len);
+		ptr[len] = '/';
 	}
 
 	CDEBUG(D_INFO, "%s: get path %s "DFID" rec: %llu ln: %u\n",