sysv: switch to simple_follow_link()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/sysv/Makefile b/fs/sysv/Makefile
index 3591f9d7a48a4a38948d30f7b523103471b85889..7a75e70a4b61b9d9fdc9fdd5d087be105304d62e 100644 (file)
--- a/fs/sysv/Makefile
+++ b/fs/sysv/Makefile
@@ -5,4 +5,4 @@
 obj-$(CONFIG_SYSV_FS) += sysv.o
 
 sysv-objs := ialloc.o balloc.o inode.o itree.o file.o dir.o \
-            namei.o super.o symlink.o
+            namei.o super.o

diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index 88956309cc86ab6d6d614315651ced6778647347..590ad9206e3f4e761d2c2ad95cfaedfa76b47e16 100644 (file)
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -166,8 +166,9 @@ void sysv_set_inode(struct inode *inode, dev_t rdev)
                        inode->i_op = &sysv_symlink_inode_operations;
                        inode->i_mapping->a_ops = &sysv_aops;
                } else {
-                       inode->i_op = &sysv_fast_symlink_inode_operations;
-                       nd_terminate_link(SYSV_I(inode)->i_data, inode->i_size,
+                       inode->i_op = &simple_symlink_inode_operations;
+                       inode->i_link = (char *)SYSV_I(inode)->i_data;
+                       nd_terminate_link(inode->i_link, inode->i_size,
                                sizeof(SYSV_I(inode)->i_data) - 1);
                }
        } else

diff --git a/fs/sysv/symlink.c b/fs/sysv/symlink.c
deleted file mode 100644 (file)
index d3fa0d7..0000000
--- a/fs/sysv/symlink.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *  linux/fs/sysv/symlink.c
- *
- *  Handling of System V filesystem fast symlinks extensions.
- *  Aug 2001, Christoph Hellwig (hch@infradead.org)
- */
-
-#include "sysv.h"
-#include <linux/namei.h>
-
-static void *sysv_follow_link(struct dentry *dentry, struct nameidata *nd)
-{
-       nd_set_link(nd, (char *)SYSV_I(d_inode(dentry))->i_data);
-       return NULL;
-}
-
-const struct inode_operations sysv_fast_symlink_inode_operations = {
-       .readlink       = generic_readlink,
-       .follow_link    = sysv_follow_link,
-};

diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
index 69d488986cce4923860c6d1f4c7ab325370fc5ce..2c13525131cd8146dd19d6a07086a70afc97b25a 100644 (file)
--- a/fs/sysv/sysv.h
+++ b/fs/sysv/sysv.h
@@ -161,7 +161,6 @@ extern ino_t sysv_inode_by_name(struct dentry *);
 
 extern const struct inode_operations sysv_file_inode_operations;
 extern const struct inode_operations sysv_dir_inode_operations;
-extern const struct inode_operations sysv_fast_symlink_inode_operations;
 extern const struct file_operations sysv_file_operations;
 extern const struct file_operations sysv_dir_operations;
 extern const struct address_space_operations sysv_aops;