------=_Part_47314_11416816.1179769586269
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

This patch does what ad@ suggested on netbsd-bugs.
I have tested it with lfs and ffs, and I haven't had any more deadlocks thusfar.

--Blair

------=_Part_47314_11416816.1179769586269
Content-Type: application/octet-stream; name="ihashlocking.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="ihashlocking.patch"

SW5kZXg6IHN5cy91ZnMvZXh0MmZzL2V4dDJmc192ZnNvcHMuYwo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxl
OiAvY3Zzcm9vdC9zcmMvc3lzL3Vmcy9leHQyZnMvZXh0MmZzX3Zmc29wcy5jLHYKcmV0cmlldmlu
ZyByZXZpc2lvbiAxLjExMApkaWZmIC11IC1yMS4xMTAgZXh0MmZzX3Zmc29wcy5jCi0tLSBzeXMv
dWZzL2V4dDJmcy9leHQyZnNfdmZzb3BzLmMJMTIgTWFyIDIwMDcgMTg6MTg6MzcgLTAwMDAJMS4x
MTAKKysrIHN5cy91ZnMvZXh0MmZzL2V4dDJmc192ZnNvcHMuYwkyMSBNYXkgMjAwNyAxNjo0Nzo0
NiAtMDAwMApAQCAtOTM2LDcgKzkzNiw3IEBACiAKIAl1bXAgPSBWRlNUT1VGUyhtcCk7CiAJZGV2
ID0gdW1wLT51bV9kZXY7Ci0KK3JldHJ5OgogCWlmICgoKnZwcCA9IHVmc19paGFzaGdldChkZXYs
IGlubywgTEtfRVhDTFVTSVZFKSkgIT0gTlVMTCkKIAkJcmV0dXJuICgwKTsKIApAQCAtOTQ4LDEx
ICs5NDgsMTEgQEAKIAlpcCA9IHBvb2xfZ2V0KCZleHQyZnNfaW5vZGVfcG9vbCwgUFJfV0FJVE9L
KTsKIAogCW11dGV4X2VudGVyKCZ1ZnNfaGFzaGxvY2spOwotCWlmICgoKnZwcCA9IHVmc19paGFz
aGdldChkZXYsIGlubywgTEtfRVhDTFVTSVZFKSkgIT0gTlVMTCkgeworCWlmICgoKnZwcCA9IHVm
c19paGFzaGdldChkZXYsIGlubywgMCkpICE9IE5VTEwpIHsKIAkJbXV0ZXhfZXhpdCgmdWZzX2hh
c2hsb2NrKTsKIAkJdW5nZXRuZXd2bm9kZSh2cCk7CiAJCXBvb2xfcHV0KCZleHQyZnNfaW5vZGVf
cG9vbCwgaXApOwotCQlyZXR1cm4gKDApOworCQlnb3RvIHJldHJ5OwogCX0KIAogCXZwLT52X2Zs
YWcgfD0gVkxPQ0tTV09SSzsKSW5kZXg6IHN5cy91ZnMvZmZzL2Zmc192ZnNvcHMuYwo9PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09ClJDUyBmaWxlOiAvY3Zzcm9vdC9zcmMvc3lzL3Vmcy9mZnMvZmZzX3Zmc29wcy5jLHYKcmV0
cmlldmluZyByZXZpc2lvbiAxLjE5OQpkaWZmIC11IC1yMS4xOTkgZmZzX3Zmc29wcy5jCi0tLSBz
eXMvdWZzL2Zmcy9mZnNfdmZzb3BzLmMJMTcgTWF5IDIwMDcgMDc6MjY6MjMgLTAwMDAJMS4xOTkK
KysrIHN5cy91ZnMvZmZzL2Zmc192ZnNvcHMuYwkyMSBNYXkgMjAwNyAxNjo0Nzo0NiAtMDAwMApA
QCAtMTQyNSw2ICsxNDI1LDcgQEAKIAl1bXAgPSBWRlNUT1VGUyhtcCk7CiAJZGV2ID0gdW1wLT51
bV9kZXY7CiAKK3JldHJ5OgogCWlmICgoKnZwcCA9IHVmc19paGFzaGdldChkZXYsIGlubywgTEtf
RVhDTFVTSVZFKSkgIT0gTlVMTCkKIAkJcmV0dXJuICgwKTsKIApAQCAtMTQ0MCwxMSArMTQ0MSwx
MSBAQAogCSAqIHB1c2ggYmFjayB0aGUgZnJlc2hseSBhbGxvY2F0ZWQgdm5vZGUgd2UgZG9uJ3Qg
bmVlZCwgYW5kIHJldHVybi4KIAkgKi8KIAltdXRleF9lbnRlcigmdWZzX2hhc2hsb2NrKTsKLQlp
ZiAoKCp2cHAgPSB1ZnNfaWhhc2hnZXQoZGV2LCBpbm8sIExLX0VYQ0xVU0lWRSkpICE9IE5VTEwp
IHsKKwlpZiAoKCp2cHAgPSB1ZnNfaWhhc2hnZXQoZGV2LCBpbm8sIDApKSAhPSBOVUxMKSB7CiAJ
CW11dGV4X2V4aXQoJnVmc19oYXNobG9jayk7CiAJCXVuZ2V0bmV3dm5vZGUodnApOwogCQlwb29s
X3B1dCgmZmZzX2lub2RlX3Bvb2wsIGlwKTsKLQkJcmV0dXJuICgwKTsKKwkJZ290byByZXRyeTsK
IAl9CiAKIAl2cC0+dl9mbGFnIHw9IFZMT0NLU1dPUks7CkluZGV4OiBzeXMvdWZzL2xmcy9sZnNf
dmZzb3BzLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3Qvc3JjL3N5cy91ZnMvbGZzL2xm
c192ZnNvcHMuYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMzUKZGlmZiAtdSAtcjEuMjM1IGxm
c192ZnNvcHMuYwotLS0gc3lzL3Vmcy9sZnMvbGZzX3Zmc29wcy5jCTE2IE1heSAyMDA3IDE5OjEx
OjM4IC0wMDAwCTEuMjM1CisrKyBzeXMvdWZzL2xmcy9sZnNfdmZzb3BzLmMJMjEgTWF5IDIwMDcg
MTY6NDc6NDcgLTAwMDAKQEAgLTExMTQsNiArMTExNCw4IEBACiAJCQkmZnMtPmxmc19pbnRlcmxv
Y2spOwogCXNpbXBsZV91bmxvY2soJmZzLT5sZnNfaW50ZXJsb2NrKTsKIAorcmV0cnk6CisKIAlp
ZiAoKCp2cHAgPSB1ZnNfaWhhc2hnZXQoZGV2LCBpbm8sIExLX0VYQ0xVU0lWRSkpICE9IE5VTEwp
CiAJCXJldHVybiAoMCk7CiAKQEAgLTExMjMsMTAgKzExMjUsMTAgQEAKIAl9CiAKIAltdXRleF9l
bnRlcigmdWZzX2hhc2hsb2NrKTsKLQlpZiAoKCp2cHAgPSB1ZnNfaWhhc2hnZXQoZGV2LCBpbm8s
IExLX0VYQ0xVU0lWRSkpICE9IE5VTEwpIHsKKwlpZiAoKCp2cHAgPSB1ZnNfaWhhc2hnZXQoZGV2
LCBpbm8sIDApKSAhPSBOVUxMKSB7CiAJCW11dGV4X2V4aXQoJnVmc19oYXNobG9jayk7CiAJCXVu
Z2V0bmV3dm5vZGUodnApOwotCQlyZXR1cm4gKDApOworCQlnb3RvIHJldHJ5OwogCX0KIAogCS8q
IFRyYW5zbGF0ZSB0aGUgaW5vZGUgbnVtYmVyIHRvIGEgZGlzayBhZGRyZXNzLiAqLwpJbmRleDog
c3lzL3Vmcy91ZnMvdWZzX2loYXNoLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3Qvc3Jj
L3N5cy91ZnMvdWZzL3Vmc19paGFzaC5jLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjIyCmRpZmYg
LXUgLXIxLjIyIHVmc19paGFzaC5jCi0tLSBzeXMvdWZzL3Vmcy91ZnNfaWhhc2guYwkyNyBGZWIg
MjAwNyAxNjoxMTo1MSAtMDAwMAkxLjIyCisrKyBzeXMvdWZzL3Vmcy91ZnNfaWhhc2guYwkyMSBN
YXkgMjAwNyAxNjo0Nzo0NyAtMDAwMApAQCAtMTQ1LDExICsxNDUsMTMgQEAKIAlMSVNUX0ZPUkVB
Q0goaXAsIGlwcCwgaV9oYXNoKSB7CiAJCWlmIChpbnVtID09IGlwLT5pX251bWJlciAmJiBkZXYg
PT0gaXAtPmlfZGV2KSB7CiAJCQl2cCA9IElUT1YoaXApOwotCQkJc2ltcGxlX2xvY2soJnZwLT52
X2ludGVybG9jayk7CiAJCQltdXRleF9leGl0KCZ1ZnNfaWhhc2hfbG9jayk7Ci0JCQlpZiAodmdl
dCh2cCwgZmxhZ3MgfCBMS19JTlRFUkxPQ0spKQotCQkJCWdvdG8gbG9vcDsKLQkJCXJldHVybiAo
dnApOworCQkJaWYgKGZsYWdzICE9IDApIHsKKwkJCQlzaW1wbGVfbG9jaygmdnAtPnZfaW50ZXJs
b2NrKTsKKwkJCQlpZiAodmdldCh2cCwgZmxhZ3MgfCBMS19JTlRFUkxPQ0spKQorCQkJCQlnb3Rv
IGxvb3A7CisJCQl9CisJCQlyZXR1cm4odnApOwogCQl9CiAJfQogCW11dGV4X2V4aXQoJnVmc19p
aGFzaF9sb2NrKTsK
------=_Part_47314_11416816.1179769586269--