Merge tag 'for-4.2' of git://git.infradead.org/battery-2.6

[linux-2.6-microblaze.git] / fs / ext3 / namei.c

diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 4264b9b..c9e767c 100644 (file)
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -2308,7 +2308,8 @@ retry:
                }
        } else {
                inode->i_op = &ext3_fast_symlink_inode_operations;
-               memcpy((char*)&EXT3_I(inode)->i_data,symname,l);
+               inode->i_link = (char*)&EXT3_I(inode)->i_data;
+               memcpy(inode->i_link, symname, l);
                inode->i_size = l-1;
        }
        EXT3_I(inode)->i_disksize = inode->i_size;