diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /fs/romfs | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'fs/romfs')
| -rw-r--r-- | fs/romfs/Makefile | 6 | ||||
| -rw-r--r-- | fs/romfs/inode.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/romfs/Makefile b/fs/romfs/Makefile index 70fd45a4e..80579f8b8 100644 --- a/fs/romfs/Makefile +++ b/fs/romfs/Makefile @@ -1,11 +1,11 @@ # -# Makefile for the linux romfs-filesystem routines. +# Makefile for the linux romfs filesystem routines. # # Note! Dependencies are done automagically by 'make dep', which also # removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). +# unless it's something special (not a .c file). # -# Note 2! The CFLAGS definitions are now in the main makefile... +# Note 2! The CFLAGS definitions are now in the main makefile. O_TARGET := romfs.o O_OBJS := inode.o diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c index 0e17b3e1d..86c9208ad 100644 --- a/fs/romfs/inode.c +++ b/fs/romfs/inode.c @@ -282,7 +282,7 @@ romfs_readdir(struct file *filp, void *dirent, filldir_t filldir) /* Not really failsafe, but we are read-only... */ for(;;) { if (!offset || offset >= maxoff) { - offset = 0xffffffff; + offset = maxoff; filp->f_pos = offset; return stored; } @@ -334,7 +334,7 @@ romfs_lookup(struct inode *dir, struct dentry *dentry) maxoff = dir->i_sb->u.romfs_sb.s_maxsize; offset = ntohl(ri.spec) & ROMFH_MASK; - /* ok, now find the file, whose name is in "dentry", in the + /* OK, now find the file whose name is in "dentry" in the * directory specified by "dir". */ name = dentry->d_name.name; |