diff --git a/[refs] b/[refs]
index 1b9a2ff1c149..03474f9e4556 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4e5d88b1b24827f4f6a3cba43228936a67d81ba
+refs/heads/master: cf8039036a6e9c5f7144841925f212a957faf1aa
diff --git a/trunk/fs/ext4/file.c b/trunk/fs/ext4/file.c
index e4095e988eba..9781099337ec 100644
--- a/trunk/fs/ext4/file.c
+++ b/trunk/fs/ext4/file.c
@@ -181,8 +181,8 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
 		path.dentry = mnt->mnt_root;
 		cp = d_path(&path, buf, sizeof(buf));
 		if (!IS_ERR(cp)) {
-			memcpy(sbi->s_es->s_last_mounted, cp,
-			       sizeof(sbi->s_es->s_last_mounted));
+			strlcpy(sbi->s_es->s_last_mounted, cp,
+				sizeof(sbi->s_es->s_last_mounted));
 			ext4_mark_super_dirty(sb);
 		}
 	}