Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c

driver due to the Origin A64 hacks.

1 files changed, 2 insertions, 8 deletions

diff --git a/fs/ufs/symlink.c b/fs/ufs/symlink.c
index 06ee82740..4550f44cf 100644
--- a/fs/ufs/symlink.c
+++ b/fs/ufs/symlink.c
@@ -1,6 +1,8 @@
 /*
  *  linux/fs/ufs/symlink.c
  *
+ * Only fast symlinks left here - the rest is done by generic code. AV, 1999
+ *
  * Copyright (C) 1998
  * Daniel Pirkl <daniel.pirkl@emai.cz>
  * Charles University, Faculty of Mathematics and Physics
@@ -24,7 +26,6 @@
  */
 
 #include <linux/fs.h>
-#include <linux/ufs_fs.h>
 
 static int ufs_readlink(struct dentry *dentry, char *buffer, int buflen)
 {
@@ -42,10 +43,3 @@ struct inode_operations ufs_fast_symlink_inode_operations = {
 	readlink:	ufs_readlink,
 	follow_link:	ufs_follow_link,
 };
-
-struct inode_operations ufs_symlink_inode_operations = {
-	readlink:	page_readlink,
-	follow_link:	page_follow_link,
-	get_block:	ufs_getfrag_block,
-	readpage:	block_read_full_page
-};