From b320c0958ebd31aed6fda4a7f492d5d8cf0496f0 Mon Sep 17 00:00:00 2001
From: Duane Griffin <duaneg@dghda.com>
Date: Fri, 19 Dec 2008 20:47:15 +0000
Subject: [PATCH] --- yaml --- r: 124991 b: refs/heads/master c:
 e83c1397cafc4e44f868289db5e417463c0d09a4 h: refs/heads/master i:   124989:
 f16d65dd77d1049dec37929e61a67f4b732c683c   124987:
 f89ea5c9f24a6e46881b227d76a3abdd1ba11e18   124983:
 0c4be3a3163893c6623a7a3852f22f744082b8fd   124975:
 08926d4ff6d1e272c56b60ded24abee7c1f7edc2   124959:
 8f48abc9e3aa5474e859da654cd36d870dcafed3   124927:
 b705b13ea68f6eaf64b3148df179ea14f1d659f9 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/inode.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4094f53aaba6..1c7fbaf16150 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5ed3112b5f74c8ec1c7aa03a76c596635e85197
+refs/heads/master: e83c1397cafc4e44f868289db5e417463c0d09a4
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index be21a5ae33cb..7c3325e0b005 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -34,6 +34,7 @@
 #include <linux/writeback.h>
 #include <linux/pagevec.h>
 #include <linux/mpage.h>
+#include <linux/namei.h>
 #include <linux/uio.h>
 #include <linux/bio.h>
 #include "ext4_jbd2.h"
@@ -4164,9 +4165,11 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
 		inode->i_op = &ext4_dir_inode_operations;
 		inode->i_fop = &ext4_dir_operations;
 	} else if (S_ISLNK(inode->i_mode)) {
-		if (ext4_inode_is_fast_symlink(inode))
+		if (ext4_inode_is_fast_symlink(inode)) {
 			inode->i_op = &ext4_fast_symlink_inode_operations;
-		else {
+			nd_terminate_link(ei->i_data, inode->i_size,
+				sizeof(ei->i_data) - 1);
+		} else {
 			inode->i_op = &ext4_symlink_inode_operations;
 			ext4_set_aops(inode);
 		}