diff --git a/[refs] b/[refs]
index e6b036ffe608..fa2f3d86e820 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e57638bb1469ba2705456e9fd4063d1890341e1
+refs/heads/master: 72749a270b6d254b4a018e290b853c27edb2fa62
diff --git a/trunk/fs/exofs/super.c b/trunk/fs/exofs/super.c
index d9619a577806..6c5397ad7a2a 100644
--- a/trunk/fs/exofs/super.c
+++ b/trunk/fs/exofs/super.c
@@ -529,7 +529,8 @@ static int exofs_devs_2_odi(struct exofs_dt_device_info *dt_dev,
 			     struct osd_dev_info *odi)
 {
 	odi->systemid_len = le32_to_cpu(dt_dev->systemid_len);
-	memcpy(odi->systemid, dt_dev->systemid, odi->systemid_len);
+	if (likely(odi->systemid_len))
+		memcpy(odi->systemid, dt_dev->systemid, OSD_SYSTEMID_LEN);
 
 	odi->osdname_len = le32_to_cpu(dt_dev->osdname_len);
 	odi->osdname = dt_dev->osdname;