diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /fs/efs | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'fs/efs')
| -rw-r--r-- | fs/efs/namei.c | 1 | ||||
| -rw-r--r-- | fs/efs/super.c | 2 | ||||
| -rw-r--r-- | fs/efs/symlink.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/fs/efs/namei.c b/fs/efs/namei.c index f19ba9469..cc85f5d9a 100644 --- a/fs/efs/namei.c +++ b/fs/efs/namei.c @@ -6,6 +6,7 @@ * Portions derived from work (c) 1995,1996 Christian Vogelgsang. */ +#include <linux/string.h> #include <linux/efs_fs.h> static efs_ino_t efs_find_entry(struct inode *inode, const char *name, int len) { diff --git a/fs/efs/super.c b/fs/efs/super.c index b6ebde3de..929c9c4f1 100644 --- a/fs/efs/super.c +++ b/fs/efs/super.c @@ -204,7 +204,7 @@ struct super_block *efs_read_super(struct super_block *s, void *d, int silent) { } s->s_op = &efs_superblock_operations; s->s_dev = dev; - s->s_root = d_alloc_root(iget(s, EFS_ROOTINODE), NULL); + s->s_root = d_alloc_root(iget(s, EFS_ROOTINODE)); unlock_super(s); if (!(s->s_root)) { diff --git a/fs/efs/symlink.c b/fs/efs/symlink.c index 4204468c5..705599eb0 100644 --- a/fs/efs/symlink.c +++ b/fs/efs/symlink.c @@ -6,6 +6,7 @@ * Portions derived from work (c) 1995,1996 Christian Vogelgsang. */ +#include <linux/string.h> #include <linux/malloc.h> #include <linux/efs_fs.h> |