Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[safe/jmp/linux-2.6] / fs / ext4 / symlink.c

diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c
index 4f79122..00740cb 100644 (file)
--- a/fs/ext4/symlink.c
+++ b/fs/ext4/symlink.c
@@ -1,5 +1,5 @@
 /*
- *  linux/fs/ext3/symlink.c
+ *  linux/fs/ext4/symlink.c
  *
  * Only fast symlinks left here - the rest is done by generic code. AV, 1999
  *
@@ -14,41 +14,41 @@
  *
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *
- *  ext3 symlink handling code
+ *  ext4 symlink handling code
  */
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
+#include <linux/jbd2.h>
 #include <linux/namei.h>
+#include "ext4.h"
 #include "xattr.h"
 
-static void * ext3_follow_link(struct dentry *dentry, struct nameidata *nd)
+static void *ext4_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-       struct ext3_inode_info *ei = EXT3_I(dentry->d_inode);
-       nd_set_link(nd, (char*)ei->i_data);
+       struct ext4_inode_info *ei = EXT4_I(dentry->d_inode);
+       nd_set_link(nd, (char *) ei->i_data);
        return NULL;
 }
 
-struct inode_operations ext3_symlink_inode_operations = {
+const struct inode_operations ext4_symlink_inode_operations = {
        .readlink       = generic_readlink,
        .follow_link    = page_follow_link_light,
        .put_link       = page_put_link,
-#ifdef CONFIG_EXT3_FS_XATTR
+#ifdef CONFIG_EXT4_FS_XATTR
        .setxattr       = generic_setxattr,
        .getxattr       = generic_getxattr,
-       .listxattr      = ext3_listxattr,
+       .listxattr      = ext4_listxattr,
        .removexattr    = generic_removexattr,
 #endif
 };
 
-struct inode_operations ext3_fast_symlink_inode_operations = {
+const struct inode_operations ext4_fast_symlink_inode_operations = {
        .readlink       = generic_readlink,
-       .follow_link    = ext3_follow_link,
-#ifdef CONFIG_EXT3_FS_XATTR
+       .follow_link    = ext4_follow_link,
+#ifdef CONFIG_EXT4_FS_XATTR
        .setxattr       = generic_setxattr,
        .getxattr       = generic_getxattr,
-       .listxattr      = ext3_listxattr,
+       .listxattr      = ext4_listxattr,
        .removexattr    = generic_removexattr,
 #endif
 };