D29045.id85071.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D29045.id85071.diff
View Options

	Index: sys/ufs/ufs/ufs_dirhash.c
	===================================================================
	--- sys/ufs/ufs/ufs_dirhash.c
	+++ sys/ufs/ufs/ufs_dirhash.c
	@@ -108,7 +108,7 @@

	#define DIRHASHLIST_LOCK() mtx_lock(&ufsdirhash_mtx)
	#define DIRHASHLIST_UNLOCK() mtx_unlock(&ufsdirhash_mtx)
	-#define DIRHASH_BLKALLOC_WAITOK() uma_zalloc(ufsdirhash_zone, M_WAITOK)
	+#define DIRHASH_BLKALLOC() uma_zalloc(ufsdirhash_zone, M_NOWAIT)
	#define DIRHASH_BLKFREE(ptr) uma_zfree(ufsdirhash_zone, (ptr))
	#define DIRHASH_ASSERT_LOCKED(dh) \
	sx_assert(&(dh)->dh_lock, SA_LOCKED)
	@@ -425,7 +425,7 @@
	if (dh->dh_blkfree == NULL)
	goto fail;
	for (i = 0; i < narrays; i++) {
	- if ((dh->dh_hash[i] = DIRHASH_BLKALLOC_WAITOK()) == NULL)
	+ if ((dh->dh_hash[i] = DIRHASH_BLKALLOC()) == NULL)
	goto fail;
	for (j = 0; j < DH_NBLKOFF; j++)
	dh->dh_hash[i][j] = DIRHASH_EMPTY;