PERFORCE change 143336 for review
Julian Elischer
julian at FreeBSD.org
Thu Jun 12 01:01:43 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=143336
Change 143336 by julian at julian_trafmon1 on 2008/06/12 01:01:13
Somehow not in last integ..
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate
Differences ...
==== //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs_ihash.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95
- * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.23 2007/11/13 19:34:06 maxim Exp $
+ * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.24 2008/06/11 18:55:19 ed Exp $
*/
#include <sys/param.h>
@@ -52,7 +52,7 @@
*/
static LIST_HEAD(nthashhead, ntnode) *ntfs_nthashtbl;
static u_long ntfs_nthash; /* size of hash table - 1 */
-#define NTNOHASH(device, inum) (&ntfs_nthashtbl[(minor(device) + (inum)) & ntfs_nthash])
+#define NTNOHASH(inum) (&ntfs_nthashtbl[(inum) & ntfs_nthash])
static struct mtx ntfs_nthash_mtx;
struct lock ntfs_hashlock;
@@ -90,7 +90,7 @@
struct ntnode *ip;
mtx_lock(&ntfs_nthash_mtx);
- LIST_FOREACH(ip, NTNOHASH(dev, inum), i_hash)
+ LIST_FOREACH(ip, NTNOHASH(inum), i_hash)
if (inum == ip->i_number && dev == ip->i_dev)
break;
mtx_unlock(&ntfs_nthash_mtx);
@@ -108,7 +108,7 @@
struct nthashhead *ipp;
mtx_lock(&ntfs_nthash_mtx);
- ipp = NTNOHASH(ip->i_dev, ip->i_number);
+ ipp = NTNOHASH(ip->i_number);
LIST_INSERT_HEAD(ipp, ip, i_hash);
ip->i_flag |= IN_HASHED;
mtx_unlock(&ntfs_nthash_mtx);
More information about the p4-projects
mailing list