diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-01-07 02:33:00 +0000 |
|---|---|---|
| committer | <ralf@linux-mips.org> | 1997-01-07 02:33:00 +0000 |
| commit | beb116954b9b7f3bb56412b2494b562f02b864b1 (patch) | |
| tree | 120e997879884e1b9d93b265221b939d2ef1ade1 /fs/nfs/symlink.c | |
| parent | 908d4681a1dc3792ecafbe64265783a86c4cccb6 (diff) | |
Import of Linux/MIPS 2.1.14
Diffstat (limited to 'fs/nfs/symlink.c')
| -rw-r--r-- | fs/nfs/symlink.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c index 85c40b495..e628e0182 100644 --- a/fs/nfs/symlink.c +++ b/fs/nfs/symlink.c @@ -8,12 +8,6 @@ * nfs symlink handling code */ -#ifdef MODULE -#include <linux/module.h> -#endif - -#include <asm/segment.h> - #include <linux/sched.h> #include <linux/errno.h> #include <linux/nfs_fs.h> @@ -22,6 +16,8 @@ #include <linux/malloc.h> #include <linux/string.h> +#include <asm/uaccess.h> + static int nfs_readlink(struct inode *, char *, int); static int nfs_follow_link(struct inode *, struct inode *, int, int, struct inode **); @@ -42,6 +38,8 @@ struct inode_operations nfs_symlink_inode_operations = { NULL, /* rename */ nfs_readlink, /* readlink */ nfs_follow_link, /* follow_link */ + NULL, /* readpage */ + NULL, /* writepage */ NULL, /* bmap */ NULL, /* truncate */ NULL /* permission */ @@ -111,8 +109,8 @@ static int nfs_readlink(struct inode *inode, char *buffer, int buflen) &res, &len, buflen); iput(inode); if (! error) { - memcpy_tofs(buffer, res, len); - put_fs_byte('\0', buffer + len); + copy_to_user(buffer, res, len); + put_user('\0', buffer + len); error = len; } kfree(mem); |