diff options
| author | semenu <semenu@FreeBSD.org> | 1999-12-03 20:37:40 +0000 |
|---|---|---|
| committer | semenu <semenu@FreeBSD.org> | 1999-12-03 20:37:40 +0000 |
| commit | 39d5a6d9a112c694b6ddfe314cd3fabd50842d57 (patch) | |
| tree | 9ce5b1cd13e28d4820c42a103ec4056e6905350a /sys/fs/ntfs/ntfs_ihash.c | |
| parent | 97f1907fc7b23a0430fdd2761931127aee747ad5 (diff) | |
| download | FreeBSD-src-39d5a6d9a112c694b6ddfe314cd3fabd50842d57.zip FreeBSD-src-39d5a6d9a112c694b6ddfe314cd3fabd50842d57.tar.gz | |
Merged NetBSD version, as they have done improvements:
1. ntfs_read*attr*() functions now accept
uio structure to eliminate one data copying.
2. found and removed deadlock caused
by 6 concurent ls -lR.
3. started implementation of nromal
Unicode<->unix recodeing.
Obtained from: NetBSD
Diffstat (limited to 'sys/fs/ntfs/ntfs_ihash.c')
| -rw-r--r-- | sys/fs/ntfs/ntfs_ihash.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c index 50ee7ac..0deecff 100644 --- a/sys/fs/ntfs/ntfs_ihash.c +++ b/sys/fs/ntfs/ntfs_ihash.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntfs_ihash.c,v 1.2 1999/05/06 15:43:19 christos Exp $ */ +/* $NetBSD: ntfs_ihash.c,v 1.5 1999/09/30 16:56:40 jdolecek Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1991, 1993, 1995 @@ -43,6 +43,7 @@ #include <sys/vnode.h> #include <sys/malloc.h> #include <sys/proc.h> +#include <sys/mount.h> #include <ntfs/ntfs.h> #include <ntfs/ntfs_inode.h> @@ -59,6 +60,7 @@ static u_long ntfs_nthash; /* size of hash table - 1 */ #ifndef NULL_SIMPLELOCKS static struct simplelock ntfs_nthash_slock; #endif +struct lock ntfs_hashlock; /* * Initialize inode hash table. @@ -66,7 +68,7 @@ static struct simplelock ntfs_nthash_slock; void ntfs_nthashinit() { - + lockinit(&ntfs_hashlock, PINOD, "ntfs_nthashlock", 0, 0); ntfs_nthashtbl = HASHINIT(desiredvnodes, M_NTFSNTHASH, M_WAITOK, &ntfs_nthash); simple_lock_init(&ntfs_nthash_slock); |
