[patch] minor pre5-2.3.9 fixes

Ingo Molnar (mingo@chiara.csoma.elte.hu)
Sun, 27 Jun 1999 00:56:33 +0200 (CEST)


This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
Send mail to mime@docserver.cac.washington.edu for more info.

---1247997369-1521504110-930437793=:5058
Content-Type: TEXT/PLAIN; charset=US-ASCII

On Sat, 26 Jun 1999, Linus Torvalds wrote:

> > Anyway, I'll reboot into my current kernel, verify that it works (and that
> > none of my asserts trigger), and make a pre-5 so that we can synch up.
>
> Rebooted, verified, looks good.

hm, not so good here, didnt even boot because genhd.c had some ugly code
that now gets properly caught by make_request(). I'm not sure wether the
attached patch is the best solution - but my system boots with it.

-- mingo

---1247997369-1521504110-930437793=:5058
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="pagecache-2.3.9-I1"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.LNX.3.96.990627005633.5058A@chiara.csoma.elte.hu>
Content-Description:

LS0tIGxpbnV4L2RyaXZlcnMvYmxvY2svZ2VuaGQuYy5vcmlnCVN1biBKdW4g
MjcgMDE6MjY6MzcgMTk5OQ0KKysrIGxpbnV4L2RyaXZlcnMvYmxvY2svZ2Vu
aGQuYwlTdW4gSnVuIDI3IDAxOjQxOjM3IDE5OTkNCkBAIC0yODUsMTAgKzI4
NSwxMCBAQA0KIAkJaGQtPnBhcnRbY3VycmVudF9taW5vcl0uc3RhcnRfc2Vj
dCA9IGZpcnN0X3NlY3RvciArIFNUQVJUX1NFQ1QocCkgKiBzZWN0b3Jfc2l6
ZTsNCiAJCXRoaXNfc2VjdG9yID0gZmlyc3Rfc2VjdG9yICsgU1RBUlRfU0VD
VChwKSAqIHNlY3Rvcl9zaXplOw0KIAkJZGV2ID0gTUtERVYoaGQtPm1ham9y
LCBjdXJyZW50X21pbm9yKTsNCi0JCWJyZWxzZShiaCk7DQorCQliZm9yZ2V0
KGJoKTsNCiAJfQ0KIGRvbmU6DQotCWJyZWxzZShiaCk7DQorCWJmb3JnZXQo
YmgpOw0KIH0NCiANCiAjaWZkZWYgQ09ORklHX1NPTEFSSVNfWDg2X1BBUlRJ
VElPTg0KQEAgLTMwNCwxMyArMzA0LDEzIEBADQogCQlyZXR1cm47DQogCXYg
PSAoc3RydWN0IHNvbGFyaXNfeDg2X3Z0b2MgKikoYmgtPmJfZGF0YSArIDUx
Mik7DQogCWlmKHYtPnZfc2FuaXR5ICE9IFNPTEFSSVNfWDg2X1ZUT0NfU0FO
RSkgew0KLQkJYnJlbHNlKGJoKTsNCisJCWJmb3JnZXQoYmgpOw0KIAkJcmV0
dXJuOw0KIAl9DQogCXByaW50aygiIDxzb2xhcmlzOiIpOw0KIAlpZih2LT52
X3ZlcnNpb24gIT0gMSkgew0KIAkJcHJpbnRrKCIgIGNhbm5vdCBoYW5kbGUg
dmVyc2lvbiAlbGQgdnRvYz4iLCB2LT52X3ZlcnNpb24pOw0KLQkJYnJlbHNl
KGJoKTsNCisJCWJmb3JnZXQoYmgpOw0KIAkJcmV0dXJuOw0KIAl9DQogCWZv
cihpPTA7IGk8U09MQVJJU19YODZfTlVNU0xJQ0U7IGkrKykgew0KQEAgLTMy
Niw3ICszMjYsNyBAQA0KIAkJYWRkX3BhcnRpdGlvbihoZCwgY3VycmVudF9t
aW5vciwgcy0+c19zdGFydCtvZmZzZXQsIHMtPnNfc2l6ZSk7DQogCQljdXJy
ZW50X21pbm9yKys7DQogCX0NCi0JYnJlbHNlKGJoKTsNCisJYmZvcmdldChi
aCk7DQogCXByaW50aygiID4iKTsNCiB9DQogI2VuZGlmDQpAQCAtMzg5LDcg
KzM4OSw3IEBADQogCWJoLT5iX3N0YXRlID0gMDsNCiAJbCA9IChzdHJ1Y3Qg
YnNkX2Rpc2tsYWJlbCAqKSAoYmgtPmJfZGF0YSs1MTIpOw0KIAlpZiAobC0+
ZF9tYWdpYyAhPSBCU0RfRElTS01BR0lDKSB7DQotCQlicmVsc2UoYmgpOw0K
KwkJYmZvcmdldChiaCk7DQogCQlyZXR1cm47DQogCX0NCiANCkBAIC00MDIs
NyArNDAyLDcgQEANCiAJCWlmIChwLT5wX2ZzdHlwZSAhPSBCU0RfRlNfVU5V
U0VEKSANCiAJCQljaGVja19hbmRfYWRkX2JzZF9wYXJ0aXRpb24oaGQsIHAs
IGRldik7DQogCX0NCi0JYnJlbHNlKGJoKTsNCisJYmZvcmdldChiaCk7DQog
DQogfQ0KICNlbmRpZg0KQEAgLTQyNSw3ICs0MjUsNyBAQA0KIAlsID0gKHN0
cnVjdCB1bml4d2FyZV9kaXNrbGFiZWwgKikgKGJoLT5iX2RhdGErNTEyKTsN
CiAJaWYgKGxlMzJfdG9fY3B1KGwtPmRfbWFnaWMpICE9IFVOSVhXQVJFX0RJ
U0tNQUdJQyB8fA0KIAkgICAgbGUzMl90b19jcHUobC0+dnRvYy52X21hZ2lj
KSAhPSBVTklYV0FSRV9ESVNLTUFHSUMyKSB7DQotCQlicmVsc2UoYmgpOw0K
KwkJYmZvcmdldChiaCk7DQogCQlyZXR1cm47DQogCX0NCiAJcHJpbnRrKCIg
PHVuaXh3YXJlOiIpOw0KQEAgLTQ0MSw3ICs0NDEsNyBAQA0KIAkJfQ0KIAkJ
cCsrOw0KIAl9DQotCWJyZWxzZShiaCk7DQorCWJmb3JnZXQoYmgpOw0KIAlw
cmludGsoIiA+Iik7DQogfQ0KICNlbmRpZg0KQEAgLTQ3Nyw3ICs0NzcsNyBA
QA0KIGNoZWNrX3RhYmxlOg0KICNlbmRpZg0KIAlpZiAoKih1bnNpZ25lZCBz
aG9ydCAqKSAgKDB4MWZlICsgZGF0YSkgIT0gY3B1X3RvX2xlMTYoTVNET1Nf
TEFCRUxfTUFHSUMpKSB7DQotCQlicmVsc2UoYmgpOw0KKwkJYmZvcmdldChi
aCk7DQogCQlyZXR1cm4gMDsNCiAJfQ0KIAlwID0gKHN0cnVjdCBwYXJ0aXRp
b24gKikgKDB4MWJlICsgZGF0YSk7DQpAQCAtNTE1LDcgKzUxNSw3IEBADQog
CQkJICogYWRqdXN0bWVudHMgdG8gZm9vbCBmZGlzay9MSUxPIGFuZCBwYXJ0
aXRpb24gY2hlY2suDQogCQkJICovDQogCQkJaWYgKGlkZV94bGF0ZV8xMDI0
KGRldiwgMSwgIiBbRE02OkRET10iKSkgew0KLQkJCQlicmVsc2UoYmgpOw0K
KwkJCQliZm9yZ2V0KGJoKTsNCiAJCQkJZ290byByZWFkX21icjsJLyogc3Rh
cnQgb3ZlciB3aXRoIG5ldyBNQlIgKi8NCiAJCQl9DQogCQl9IGVsc2UgaWYg
KHNpZyA8PSAweDFhZSAmJg0KQEAgLTYyNyw3ICs2MjcsNyBAQA0KIAkJfQ0K
IAl9DQogCXByaW50aygiXG4iKTsNCi0JYnJlbHNlKGJoKTsNCisJYmZvcmdl
dChiaCk7DQogCXJldHVybiAxOw0KIH0NCiANCkBAIC02ODIsMTIgKzY4Miwx
MiBAQA0KIAlwYXJ0aXRpb24gPSBsYWJlbC0+ZF9wYXJ0aXRpb25zOw0KIAlp
ZiAobGFiZWwtPmRfbWFnaWMgIT0gRElTS0xBQkVMTUFHSUMpIHsNCiAJCXBy
aW50aygibWFnaWM6ICUwOHhcbiIsIGxhYmVsLT5kX21hZ2ljKTsNCi0JCWJy
ZWxzZShiaCk7DQorCQliZm9yZ2V0KGJoKTsNCiAJCXJldHVybiAwOw0KIAl9
DQogCWlmIChsYWJlbC0+ZF9tYWdpYzIgIT0gRElTS0xBQkVMTUFHSUMpIHsN
CiAJCXByaW50aygibWFnaWMyOiAlMDh4XG4iLCBsYWJlbC0+ZF9tYWdpYzIp
Ow0KLQkJYnJlbHNlKGJoKTsNCisJCWJmb3JnZXQoYmgpOw0KIAkJcmV0dXJu
IDA7DQogCX0NCiAJZm9yIChpID0gMCA7IGkgPCBsYWJlbC0+ZF9ucGFydGl0
aW9uczsgaSsrLCBwYXJ0aXRpb24rKykgew0KQEAgLTcwMCw3ICs3MDAsNyBA
QA0KIAkJY3VycmVudF9taW5vcisrOw0KIAl9DQogCXByaW50aygiXG4iKTsN
Ci0JYnJlbHNlKGJoKTsNCisJYmZvcmdldChiaCk7DQogCXJldHVybiAxOw0K
IH0NCiANCkBAIC03NDcsNyArNzQ3LDcgQEANCiAJaWYgKGJlMTZfdG9fY3B1
KGxhYmVsLT5tYWdpYykgIT0gU1VOX0xBQkVMX01BR0lDKSB7DQogCQlwcmlu
dGsoIkRldiAlcyBTdW4gZGlza2xhYmVsOiBiYWQgbWFnaWMgJTA0eFxuIiwN
CiAJCSAgICAgICBrZGV2bmFtZShkZXYpLCBiZTE2X3RvX2NwdShsYWJlbC0+
bWFnaWMpKTsNCi0JCWJyZWxzZShiaCk7DQorCQliZm9yZ2V0KGJoKTsNCiAJ
CXJldHVybiAwOw0KIAl9DQogCS8qIExvb2sgYXQgdGhlIGNoZWNrc3VtICov
DQpAQCAtNzU3LDcgKzc1Nyw3IEBADQogCWlmKGNzdW0pIHsNCiAJCXByaW50
aygiRGV2ICVzIFN1biBkaXNrbGFiZWw6IENzdW0gYmFkLCBsYWJlbCBjb3Jy
dXB0ZWRcbiIsDQogCQkgICAgICAga2Rldm5hbWUoZGV2KSk7DQotCQlicmVs
c2UoYmgpOw0KKwkJYmZvcmdldChiaCk7DQogCQlyZXR1cm4gMDsNCiAJfQ0K
IAkvKiBBbGwgU3VuIGRpc2tzIGhhdmUgOCBwYXJ0aXRpb24gZW50cmllcyAq
Lw0KQEAgLTc3Myw3ICs3NzMsNyBAQA0KIAkJY3VycmVudF9taW5vcisrOw0K
IAl9DQogCXByaW50aygiXG4iKTsNCi0JYnJlbHNlKGJoKTsNCisJYmZvcmdl
dChiaCk7DQogCXJldHVybiAxOw0KIH0NCiANCkBAIC04MjEsNyArODIxLDcg
QEANCiAJaWYoYmUzMl90b19jcHUobWFnaWMpICE9IFNHSV9MQUJFTF9NQUdJ
Qykgew0KIAkJcHJpbnRrKCJEZXYgJXMgU0dJIGRpc2tsYWJlbDogYmFkIG1h
Z2ljICUwOHhcbiIsDQogCQkgICAgICAga2Rldm5hbWUoZGV2KSwgbWFnaWMp
Ow0KLQkJYnJlbHNlKGJoKTsNCisJCWJmb3JnZXQoYmgpOw0KIAkJcmV0dXJu
IDA7DQogCX0NCiAJdWkgPSAoKHVuc2lnbmVkIGludCAqKSAobGFiZWwgKyAx
KSkgLSAxOw0KQEAgLTgzMiw3ICs4MzIsNyBAQA0KIAlpZihjc3VtKSB7DQog
CQlwcmludGsoIkRldiAlcyBTR0kgZGlza2xhYmVsOiBjc3VtIGJhZCwgbGFi
ZWwgY29ycnVwdGVkXG4iLA0KIAkJICAgICAgIGtkZXZuYW1lKGRldikpOw0K
LQkJYnJlbHNlKGJoKTsNCisJCWJmb3JnZXQoYmgpOw0KIAkJcmV0dXJuIDA7
DQogCX0NCiAJLyogQWxsIFNHSSBkaXNrIGxhYmVscyBoYXZlIDE2IHBhcnRp
dGlvbnMsIGRpc2tzIHVuZGVyIExpbnV4IG9ubHkNCkBAIC04NDksNyArODQ5
LDcgQEANCiAJCWN1cnJlbnRfbWlub3IrKzsNCiAJfQ0KIAlwcmludGsoIlxu
Iik7DQotCWJyZWxzZShiaCk7DQorCWJmb3JnZXQoYmgpOw0KIAlyZXR1cm4g
MTsNCiB9DQogDQpAQCAtOTAzLDcgKzkwMyw3IEBADQogCQkJCSoodTMyICop
KCZiaC0+Yl9kYXRhWzB4ZGNdKSA9IDA7DQogCQkJCWlmIChjaGVja3N1bV9i
bG9jaygodTMyICopYmgtPmJfZGF0YSwNCiAJCQkJCQlodG9ubChyZGItPnJk
Yl9TdW1tZWRMb25ncykgJiAweDdGKSkgew0KLQkJCQkJYnJlbHNlKGJoKTsN
CisJCQkJCWJmb3JnZXQoYmgpOw0KIAkJCQkJcHJpbnRrKCJEZXYgJXM6IFJE
QiBpbiBibG9jayAlZCBoYXMgYmFkIGNoZWNrc3VtXG4iLA0KIAkJCQkJICAg
ICAgIGtkZXZuYW1lKGRldiksYmxrKTsNCiAJCQkJCWNvbnRpbnVlOw0KQEAg
LTkxMyw3ICs5MTMsNyBAQA0KIAkJCX0NCiAJCQlwcmludGsoIiBSRFNLIik7
DQogCQkJYmxrID0gaHRvbmwocmRiLT5yZGJfUGFydGl0aW9uTGlzdCk7DQot
CQkJYnJlbHNlKGJoKTsNCisJCQliZm9yZ2V0KGJoKTsNCiAJCQlmb3IgKHBh
cnQgPSAxOyBibGsgPiAwICYmIHBhcnQgPD0gMTY7IHBhcnQrKykgew0KIAkJ
CQlpZiAoIShiaCA9IGJyZWFkKGRldixibGssYmxvY2tzaXplKSkpIHsNCiAJ
CQkJCXByaW50aygiRGV2ICVzOiB1bmFibGUgdG8gcmVhZCBwYXJ0aXRpb24g
YmxvY2sgJWRcbiIsDQpAQCAtOTQwLDcgKzk0MCw3IEBADQogCQkJCQljdXJy
ZW50X21pbm9yKys7DQogCQkJCQlyZXMgPSAxOw0KIAkJCQl9DQotCQkJCWJy
ZWxzZShiaCk7DQorCQkJCWJmb3JnZXQoYmgpOw0KIAkJCX0NCiAJCQlwcmlu
dGsoIlxuIik7DQogCQkJYnJlYWs7DQpAQCAtMTAyMSwxMiArMTAyMSwxMiBA
QA0KIAl9DQogCW1kID0gKHN0cnVjdCBtYWNfZHJpdmVyX2Rlc2MgKikgYmgt
PmJfZGF0YTsNCiAJaWYgKGJlMTZfdG9fY3B1KG1kLT5zaWduYXR1cmUpICE9
IE1BQ19EUklWRVJfTUFHSUMpIHsNCi0JCWJyZWxzZShiaCk7DQorCQliZm9y
Z2V0KGJoKTsNCiAJCXJldHVybiAwOw0KIAl9DQogCXNlY3NpemUgPSBiZTE2
X3RvX2NwdShtZC0+YmxvY2tfc2l6ZSk7DQogCWlmIChzZWNzaXplID49IGRl
dl9ic2l6ZSkgew0KLQkJYnJlbHNlKGJoKTsNCisJCWJmb3JnZXQoYmgpOw0K
IAkJZGV2X3BvcyA9IHNlY3NpemU7DQogCQlpZiAoKGJoID0gYnJlYWQoZGV2
LCBzZWNzaXplL2Rldl9ic2l6ZSwgZGV2X2JzaXplKSkgPT0gMCkgew0KIAkJ
CXByaW50aygiJXM6IGVycm9yIHJlYWRpbmcgcGFydGl0aW9uIHRhYmxlXG4i
LA0KQEAgLTEwMzYsMTQgKzEwMzYsMTQgQEANCiAJfQ0KIAlwYXJ0ID0gKHN0
cnVjdCBtYWNfcGFydGl0aW9uICopIChiaC0+Yl9kYXRhICsgc2Vjc2l6ZSAt
IGRldl9wb3MpOw0KIAlpZiAoYmUxNl90b19jcHUocGFydC0+c2lnbmF0dXJl
KSAhPSBNQUNfUEFSVElUSU9OX01BR0lDKSB7DQotCQlicmVsc2UoYmgpOw0K
KwkJYmZvcmdldChiaCk7DQogCQlyZXR1cm4gMDsJCS8qIG5vdCBhIE1hY09T
IGRpc2sgKi8NCiAJfQ0KIAlibG9ja3NfaW5fbWFwID0gYmUzMl90b19jcHUo
cGFydC0+bWFwX2NvdW50KTsNCiAJZm9yIChibGsgPSAxOyBibGsgPD0gYmxv
Y2tzX2luX21hcDsgKytibGspIHsNCiAJCXBvcyA9IGJsayAqIHNlY3NpemU7
DQogCQlpZiAocG9zID49IGRldl9wb3MgKyBkZXZfYnNpemUpIHsNCi0JCQli
cmVsc2UoYmgpOw0KKwkJCWJmb3JnZXQoYmgpOw0KIAkJCWRldl9wb3MgPSBw
b3M7DQogCQkJaWYgKChiaCA9IGJyZWFkKGRldiwgcG9zL2Rldl9ic2l6ZSwg
ZGV2X2JzaXplKSkgPT0gMCkgew0KIAkJCQlwcmludGsoIiVzOiBlcnJvciBy
ZWFkaW5nIHBhcnRpdGlvbiB0YWJsZVxuIiwNCkBAIC0xMDc0LDcgKzEwNzQs
NyBAQA0KIA0KIAkJKytjdXJyZW50X21pbm9yOw0KIAl9DQotCWJyZWxzZShi
aCk7DQorCWJmb3JnZXQoYmgpOw0KIAlwcmludGsoIlxuIik7DQogCXJldHVy
biAxOw0KIH0NCkBAIC0xMTMzLDcgKzExMzMsNyBAQA0KIAkJICBpZiAoIXhi
aCkNCiAJCSAgICB7DQogCQkgICAgICBwcmludGsgKCIgYmxvY2sgJWxkIHJl
YWQgZmFpbGVkXG4iLCBwYXJ0c2VjdCk7DQotCQkgICAgICBicmVsc2UoYmgp
Ow0KKwkJICAgICAgYmZvcmdldChiaCk7DQogCQkgICAgICByZXR1cm4gMDsN
CiAJCSAgICB9DQogCQkgIGlmIChwYXJ0c2VjdCAmIDEpDQpAQCAtMTE1Miwx
NyArMTE1MiwxNyBAQA0KIA0KIAkJICBpZiAoISh4cnMtPnBhcnRbMV0uZmxn
ICYgMSkpIHsNCiAJCSAgICAvKiBlbmQgb2YgbGlua2VkIHBhcnRpdGlvbiBs
aXN0ICovDQotCQkgICAgYnJlbHNlKCB4YmggKTsNCisJCSAgICBiZm9yZ2V0
KCB4YmggKTsNCiAJCSAgICBicmVhazsNCiAJCSAgfQ0KIAkJICBpZiAobWVt
Y21wKCB4cnMtPnBhcnRbMV0uaWQsICJYR00iLCAzICkgIT0gMCkgew0KIAkJ
ICAgIHByaW50ayggIlxuSUQgb2YgZXh0ZW5kZWQgcGFydGl0aW9uIGlzIG5v
dCBYR00hXG4iICk7DQotCQkgICAgYnJlbHNlKCB4YmggKTsNCisJCSAgICBi
Zm9yZ2V0KCB4YmggKTsNCiAJCSAgICBicmVhazsNCiAJCSAgfQ0KIA0KIAkJ
ICBwYXJ0c2VjdCA9IHhycy0+cGFydFsxXS5zdCArIGV4dGVuc2VjdDsNCi0J
CSAgYnJlbHNlICh4YmgpOw0KKwkJICBiZm9yZ2V0ICh4YmgpOw0KIAkJICBt
aW5vcisrOw0KIAkJICBpZiAobWlub3IgPj0gbV9saW0pIHsNCiAJCSAgICBw
cmludGsoICJcbk1heGltdW0gbnVtYmVyIG9mIHBhcnRpdGlvbnMgcmVhY2hl
ZCFcbiIgKTsNCkBAIC0xMjA4LDcgKzEyMDgsNyBAQA0KICAgICB9DQogICB9
DQogI2VuZGlmDQotICBicmVsc2UgKGJoKTsNCisgIGJmb3JnZXQgKGJoKTsN
CiANCiAgIHByaW50ayAoIlxuIik7DQogDQo=
---1247997369-1521504110-930437793=:5058--

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/