Merge branch btrfs-master into for-linus

[sfrench/cifs-2.6.git] / fs / ufs / symlink.c

diff --git a/fs/ufs/symlink.c b/fs/ufs/symlink.c
index 337512ed57814ac1949c440ef89c2e1389ad2cfc..c0156eda44bcff1e53e17689167da63b046ca926 100644 (file)
--- a/fs/ufs/symlink.c
+++ b/fs/ufs/symlink.c
@@ -27,7 +27,10 @@
 
 #include <linux/fs.h>
 #include <linux/namei.h>
-#include <linux/ufs_fs.h>
+
+#include "ufs_fs.h"
+#include "ufs.h"
+
 
 static void *ufs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
@@ -36,7 +39,7 @@ static void *ufs_follow_link(struct dentry *dentry, struct nameidata *nd)
        return NULL;
 }
 
-struct inode_operations ufs_fast_symlink_inode_operations = {
+const struct inode_operations ufs_fast_symlink_inode_operations = {
        .readlink       = generic_readlink,
        .follow_link    = ufs_follow_link,
 };