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/ntfs | |
| 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/ntfs')
| -rw-r--r-- | fs/ntfs/fs.c | 2 | ||||
| -rw-r--r-- | fs/ntfs/util.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/ntfs/fs.c b/fs/ntfs/fs.c index f34de38d3..a43e071fe 100644 --- a/fs/ntfs/fs.c +++ b/fs/ntfs/fs.c @@ -978,7 +978,7 @@ struct super_block * ntfs_read_super(struct super_block *sb, ntfs_debug(DEBUG_OTHER, "Getting RootDir\n"); /* Get the root directory */ - if(!(sb->s_root=d_alloc_root(iget(sb,FILE_ROOT),NULL))){ + if(!(sb->s_root=d_alloc_root(iget(sb,FILE_ROOT)))){ ntfs_error("Could not get root dir inode\n"); goto ntfs_read_super_mft; } diff --git a/fs/ntfs/util.c b/fs/ntfs/util.c index d6d7921eb..e0f9b2362 100644 --- a/fs/ntfs/util.c +++ b/fs/ntfs/util.c @@ -12,6 +12,7 @@ #include "struct.h" #include "util.h" +#include <linux/string.h> #include <linux/errno.h> /* FreeBSD doesn't seem to have EILSEQ in errno.h */ #ifndef EILSEQ |