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/sysv/dir.c | |
| parent | 908d4681a1dc3792ecafbe64265783a86c4cccb6 (diff) | |
Import of Linux/MIPS 2.1.14
Diffstat (limited to 'fs/sysv/dir.c')
| -rw-r--r-- | fs/sysv/dir.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c index cfd85993e..52515b4f9 100644 --- a/fs/sysv/dir.c +++ b/fs/sysv/dir.c @@ -13,18 +13,16 @@ * SystemV/Coherent directory handling functions */ -#ifdef MODULE -#include <linux/module.h> -#endif - -#include <asm/segment.h> - #include <linux/errno.h> #include <linux/fs.h> #include <linux/sysv_fs.h> #include <linux/stat.h> +#include <linux/string.h> + +#include <asm/uaccess.h> -static int sysv_dir_read(struct inode * inode, struct file * filp, char * buf, int count) +static long sysv_dir_read(struct inode * inode, struct file * filp, + char * buf, unsigned long count) { return -EISDIR; } @@ -60,6 +58,8 @@ struct inode_operations sysv_dir_inode_operations = { sysv_rename, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ + NULL, /* readpage */ + NULL, /* writepage */ NULL, /* bmap */ sysv_truncate, /* truncate */ NULL /* permission */ @@ -95,8 +95,10 @@ static int sysv_readdir(struct inode * inode, struct file * filp, memcpy(&sde, de, sizeof(struct sysv_dir_entry)); if (sde.inode > inode->i_sb->sv_ninodes) - printk("sysv_readdir: Bad inode number on dev 0x%04x, ino %ld, offset 0x%04lx: %d is out of range\n", - inode->i_dev, inode->i_ino, (off_t) filp->f_pos, sde.inode); + printk("sysv_readdir: Bad inode number on dev " + "%s, ino %ld, offset 0x%04lx: %d is out of range\n", + kdevname(inode->i_dev), + inode->i_ino, (off_t) filp->f_pos, sde.inode); i = strnlen(sde.name, SYSV_NAMELEN); if (filldir(dirent, sde.name, i, filp->f_pos, sde.inode) < 0) { |