From 75e1d90cef2d11979a8549d2b4de67357836d428 Mon Sep 17 00:00:00 2001 From: Duane Griffin Date: Fri, 19 Dec 2008 20:47:14 +0000 Subject: [PATCH] --- yaml --- r: 124990 b: refs/heads/master c: b5ed3112b5f74c8ec1c7aa03a76c596635e85197 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext3/inode.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 78d6fffe207e..4094f53aaba6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d6d0c4da2dbbe0a69fea3692146af39f139f8b4 +refs/heads/master: b5ed3112b5f74c8ec1c7aa03a76c596635e85197 diff --git a/trunk/fs/ext3/inode.c b/trunk/fs/ext3/inode.c index f8424ad89971..c4bdccf976b5 100644 --- a/trunk/fs/ext3/inode.c +++ b/trunk/fs/ext3/inode.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "xattr.h" #include "acl.h" @@ -2817,9 +2818,11 @@ struct inode *ext3_iget(struct super_block *sb, unsigned long ino) inode->i_op = &ext3_dir_inode_operations; inode->i_fop = &ext3_dir_operations; } else if (S_ISLNK(inode->i_mode)) { - if (ext3_inode_is_fast_symlink(inode)) + if (ext3_inode_is_fast_symlink(inode)) { inode->i_op = &ext3_fast_symlink_inode_operations; - else { + nd_terminate_link(ei->i_data, inode->i_size, + sizeof(ei->i_data) - 1); + } else { inode->i_op = &ext3_symlink_inode_operations; ext3_set_aops(inode); }