patch-2.3.32 linux/fs/ext2/symlink.c

• Lines: 108
• Date: Thu Dec 9 13:10:18 1999
• Orig file: v2.3.31/linux/fs/ext2/symlink.c
• Orig date: Tue Dec 7 09:32:47 1999

diff -u --recursive --new-file v2.3.31/linux/fs/ext2/symlink.c linux/fs/ext2/symlink.c
@@ -16,89 +16,28 @@
  */
 
 #include <linux/fs.h>
-#include <asm/uaccess.h>
+#include <linux/ext2_fs.h>
 
-
-
-static int ext2_readlink (struct dentry *, char *, int);
-static struct dentry *ext2_follow_link(struct dentry *, struct dentry *, unsigned int);
-
-/*
- * symlinks can't do much...
- */
-struct inode_operations ext2_symlink_inode_operations = {
-	NULL,			/* no file-operations */
-	NULL,			/* create */
-	NULL,			/* lookup */
-	NULL,			/* link */
-	NULL,			/* unlink */
-	NULL,			/* symlink */
-	NULL,			/* mkdir */
-	NULL,			/* rmdir */
-	NULL,			/* mknod */
-	NULL,			/* rename */
-	ext2_readlink,		/* readlink */
-	ext2_follow_link,	/* follow_link */
-	NULL,			/* get_block */
-	NULL,			/* readpage */
-	NULL,			/* writepage */
-	NULL,			/* truncate */
-	NULL,			/* permission */
-	NULL			/* revalidate */
-};
-
-static struct dentry * ext2_follow_link(struct dentry * dentry,
-					struct dentry *base,
-					unsigned int follow)
+static int ext2_readlink(struct dentry *dentry, char *buffer, int buflen)
 {
-	struct inode *inode = dentry->d_inode;
-	struct buffer_head * bh = NULL;
-	int error;
-	char * link;
-
-	link = (char *) inode->u.ext2_i.i_data;
-	if (inode->i_blocks) {
-		if (!(bh = ext2_bread (inode, 0, 0, &error))) {
-			dput(base);
-			return ERR_PTR(-EIO);
-		}
-		link = bh->b_data;
-	}
-	UPDATE_ATIME(inode);
-	base = lookup_dentry(link, base, follow);
-	if (bh)
-		brelse(bh);
-	return base;
+	char *s = (char *)dentry->d_inode->u.ext2_i.i_data;
+	return vfs_readlink(dentry, buffer, buflen, s);
 }
 
-static int ext2_readlink (struct dentry * dentry, char * buffer, int buflen)
+static struct dentry *ext2_follow_link(struct dentry *dentry, struct dentry *base, unsigned flags)
 {
-	struct inode *inode = dentry->d_inode;
-	struct buffer_head * bh = NULL;
-	char * link;
-	int i;
-
-	if (buflen > inode->i_sb->s_blocksize - 1)
-		buflen = inode->i_sb->s_blocksize - 1;
+	char *s = (char *)dentry->d_inode->u.ext2_i.i_data;
+	return vfs_follow_link(dentry, base, flags, s);
+}
 
-	link = (char *) inode->u.ext2_i.i_data;
-	if (inode->i_blocks) {
-		int err;
-		bh = ext2_bread (inode, 0, 0, &err);
-		if (!bh) {
-			if(err < 0) /* indicate type of error */
-				return err;
-			return 0;
-		}
-		link = bh->b_data;
-	}
+struct inode_operations ext2_fast_symlink_inode_operations = {
+	readlink:	ext2_readlink,
+	follow_link:	ext2_follow_link,
+};
 
-	i = 0;
-	while (i < buflen && link[i])
-		i++;
-	if (copy_to_user(buffer, link, i))
-		i = -EFAULT;
-	if (bh)
-		brelse (bh);
-	return i;
-}
+struct inode_operations ext2_symlink_inode_operations = {
+	readlink:	page_readlink,
+	follow_link:	page_follow_link,
+	get_block:	ext2_get_block,
+	readpage:	block_read_full_page,
+};