fix to compile with refactored headers

[linux-2.6.git] / fs / ext3 / symlink.c

diff --git a/fs/ext3/symlink.c b/fs/ext3/symlink.c
index 65ce3ff..d9526d7 100644 (file)
--- a/fs/ext3/symlink.c
+++ b/fs/ext3/symlink.c
@@ -20,30 +20,37 @@
 #include <linux/fs.h>
 #include <linux/jbd.h>
 #include <linux/ext3_fs.h>
+#include <linux/namei.h>
 #include "xattr.h"
 
-static int ext3_follow_link(struct dentry *dentry, struct nameidata *nd)
+static void * ext3_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);
-       return 0;
+       return NULL;
 }
 
 struct inode_operations ext3_symlink_inode_operations = {
        .readlink       = generic_readlink,
        .follow_link    = page_follow_link_light,
        .put_link       = page_put_link,
-       .setxattr       = ext3_setxattr,
-       .getxattr       = ext3_getxattr,
+#ifdef CONFIG_EXT3_FS_XATTR
+       .setxattr       = generic_setxattr,
+       .getxattr       = generic_getxattr,
        .listxattr      = ext3_listxattr,
-       .removexattr    = ext3_removexattr,
+       .removexattr    = generic_removexattr,
+#endif
+       .sync_flags     = ext3_sync_flags,
 };
 
 struct inode_operations ext3_fast_symlink_inode_operations = {
        .readlink       = generic_readlink,
        .follow_link    = ext3_follow_link,
-       .setxattr       = ext3_setxattr,
-       .getxattr       = ext3_getxattr,
+#ifdef CONFIG_EXT3_FS_XATTR
+       .setxattr       = generic_setxattr,
+       .getxattr       = generic_getxattr,
        .listxattr      = ext3_listxattr,
-       .removexattr    = ext3_removexattr,
+       .removexattr    = generic_removexattr,
+#endif
+       .sync_flags     = ext3_sync_flags,
 };