From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id qA85bjMn219466 for ; Wed, 7 Nov 2012 23:37:45 -0600 Received: from ipmail06.adl2.internode.on.net (ipmail06.adl2.internode.on.net [150.101.137.129]) by cuda.sgi.com with ESMTP id zRMJzB2ZmBGE4OuB for ; Wed, 07 Nov 2012 21:39:39 -0800 (PST) Received: from disappointment ([192.168.1.1]) by dastard with esmtp (Exim 4.76) (envelope-from ) id 1TWKq0-0003NA-2k for xfs@oss.sgi.com; Thu, 08 Nov 2012 16:39:36 +1100 Received: from dave by disappointment with local (Exim 4.80) (envelope-from ) id 1TWKpz-0004v5-Ul for xfs@oss.sgi.com; Thu, 08 Nov 2012 16:39:35 +1100 From: Dave Chinner Subject: =?UTF-8?q?=5BPATCH=201/3=5D=20xfs=3A=20use=20btree=20block=20initialisation=20functions=20in=20growfs?= Date: Thu, 8 Nov 2012 16:39:31 +1100 Message-Id: <1352353173-18820-2-git-send-email-david@fromorbit.com> In-Reply-To: <1352353173-18820-1-git-send-email-david@fromorbit.com> References: <1352353173-18820-1-git-send-email-david@fromorbit.com> MIME-Version: 1.0 List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com RnJvbTogRGF2ZSBDaGlubmVyIDxkY2hpbm5lckByZWRoYXQuY29tPgoKRmFjdG9yIHhmc19idHJl ZV9pbml0X2Jsb2NrKCkgdG8gYmUgaW5kZXBlbmRlbnQgb2YgdGhlIGJ0cmVlIGN1cnNvciwKYW5k IHVzZSB0aGUgZnVuY3Rpb24gdG8gaW5pdGlhbGlzZSBidHJlZSBibG9ja3MgaW4gdGhlIGdyb3dm cyBjb2RlLgpUaGlzIG1ha2VzIGFkZGluZyBzdXBwb3J0IGZvciBkaWZmZXJlbnQgZm9ybWF0IGJ0 cmVlIGJsb2NrcyBzaW1wbGUuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIENoaW5uZXIgPGRjaGlubmVy QHJlZGhhdC5jb20+Ci0tLQogZnMveGZzL3hmc19idHJlZS5jIHwgICAzMyArKysrKysrKysrKysr KysrKysrKysrKystLS0tLS0tLS0KIGZzL3hmcy94ZnNfYnRyZWUuaCB8ICAgMTEgKysrKysrKysr KysKIGZzL3hmcy94ZnNfZnNvcHMuYyB8ICAgMzcgKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9mcy94ZnMveGZzX2J0cmVlLmMgYi9mcy94ZnMveGZzX2J0cmVl LmMKaW5kZXggNzkwMzlmYS4uZGIwMTA0MCAxMDA2NDQKLS0tIGEvZnMveGZzL3hmc19idHJlZS5j CisrKyBiL2ZzL3hmcy94ZnNfYnRyZWUuYwpAQCAtODYyLDE4ICs4NjIsMjIgQEAgeGZzX2J0cmVl X3NldF9zaWJsaW5nKAogCX0KIH0KIAotU1RBVElDIHZvaWQKK3ZvaWQKIHhmc19idHJlZV9pbml0 X2Jsb2NrKAotCXN0cnVjdCB4ZnNfYnRyZWVfY3VyCSpjdXIsCi0JaW50CQkJbGV2ZWwsCi0JaW50 CQkJbnVtcmVjcywKLQlzdHJ1Y3QgeGZzX2J0cmVlX2Jsb2NrCSpuZXcpCS8qIG5ldyBibG9jayAq LworCXN0cnVjdCB4ZnNfbW91bnQgKm1wLAorCXN0cnVjdCB4ZnNfYnVmCSpicCwKKwlfX3UzMgkJ bWFnaWMsCisJX191MTYJCWxldmVsLAorCV9fdTE2CQludW1yZWNzLAorCXVuc2lnbmVkIGludAlm bGFncykKIHsKLQluZXctPmJiX21hZ2ljID0gY3B1X3RvX2JlMzIoeGZzX21hZ2ljc1tjdXItPmJj X2J0bnVtXSk7CisJc3RydWN0IHhmc19idHJlZV9ibG9jawkqbmV3ID0gWEZTX0JVRl9UT19CTE9D SyhicCk7CisKKwluZXctPmJiX21hZ2ljID0gY3B1X3RvX2JlMzIobWFnaWMpOwogCW5ldy0+YmJf bGV2ZWwgPSBjcHVfdG9fYmUxNihsZXZlbCk7CiAJbmV3LT5iYl9udW1yZWNzID0gY3B1X3RvX2Jl MTYobnVtcmVjcyk7CiAKLQlpZiAoY3VyLT5iY19mbGFncyAmIFhGU19CVFJFRV9MT05HX1BUUlMp IHsKKwlpZiAoZmxhZ3MgJiBYRlNfQlRSRUVfTE9OR19QVFJTKSB7CiAJCW5ldy0+YmJfdS5sLmJi X2xlZnRzaWIgPSBjcHVfdG9fYmU2NChOVUxMREZTQk5PKTsKIAkJbmV3LT5iYl91LmwuYmJfcmln aHRzaWIgPSBjcHVfdG9fYmU2NChOVUxMREZTQk5PKTsKIAl9IGVsc2UgewpAQCAtODgyLDYgKzg4 NiwxNyBAQCB4ZnNfYnRyZWVfaW5pdF9ibG9jaygKIAl9CiB9CiAKK1NUQVRJQyB2b2lkCit4ZnNf YnRyZWVfaW5pdF9ibG9ja19jdXIoCisJc3RydWN0IHhmc19idHJlZV9jdXIJKmN1ciwKKwlpbnQJ CQlsZXZlbCwKKwlpbnQJCQludW1yZWNzLAorCXN0cnVjdCB4ZnNfYnVmCQkqYnApCit7CisJeGZz X2J0cmVlX2luaXRfYmxvY2soY3VyLT5iY19tcCwgYnAsIHhmc19tYWdpY3NbY3VyLT5iY19idG51 bV0sCisJCQkgICAgICAgbGV2ZWwsIG51bXJlY3MsIGN1ci0+YmNfZmxhZ3MpOworfQorCiAvKgog ICogUmV0dXJuIHRydWUgaWYgcHRyIGlzIHRoZSBsYXN0IHJlY29yZCBpbiB0aGUgYnRyZWUgYW5k CiAgKiB3ZSBuZWVkIHRvIHRyYWNrIHVwZGF0ZdGVIHRvIHRoaXMgcmVjb3JkLiAgVGhlIGRlY2lz aW9uCkBAIC0yMTg5LDcgKzIyMDQsNyBAQCB4ZnNfYnRyZWVfc3BsaXQoCiAJCWdvdG8gZXJyb3Iw OwogCiAJLyogRmlsbCBpbiB0aGUgYnRyZWUgaGVhZGVyIGZvciB0aGUgbmV3IHJpZ2h0IGJsb2Nr LiAqLwotCXhmc19idHJlZV9pbml0X2Jsb2NrKGN1ciwgeGZzX2J0cmVlX2dldF9sZXZlbChsZWZ0 KSwgMCwgcmlnaHQpOworCXhmc19idHJlZV9pbml0X2Jsb2NrX2N1cihjdXIsIHhmc19idHJlZV9n ZXRfbGV2ZWwobGVmdCksIDAsIHJicCk7CiAKIAkvKgogCSAqIFNwbGl0IHRoZSBlbnRyaWVzIGJl dHdlZW4gdGhlIG9sZCBhbmQgdGhlIG5ldyBibG9jayBldmVubHkuCkBAIC0yNDk4LDcgKzI1MTMs NyBAQCB4ZnNfYnRyZWVfbmV3X3Jvb3QoCiAJCW5wdHIgPSAyOwogCX0KIAkvKiBGaWxsIGluIHRo ZSBuZXcgYmxvY2sncyBidHJlZSBoZWFkZXIgYW5kIGxvZyBpdC4gKi8KLQl4ZnNfYnRyZWVfaW5p dF9ibG9jayhjdXIsIGN1ci0+YmNfbmxldmVscywgMiwgbmV3KTsKKwl4ZnNfYnRyZWVfaW5pdF9i bG9ja19jdXIoY3VyLCBjdXItPmJjX25sZXZlbHMsIDIsIG5icCk7CiAJeGZzX2J0cmVlX2xvZ19i bG9jayhjdXIsIG5icCwgWEZTX0JCX0FMTF9CSVRTKTsKIAlBU1NFUlQoIXhmc19idHJlZV9wdHJf aXNfbnVsbChjdXIsICZscHRyKSAmJgogCQkJIXhmc19idHJlZV9wdHJfaXNfbnVsbChjdXIsICZy cHRyKSk7CmRpZmYgLS1naXQgYS9mcy94ZnMveGZzX2J0cmVlLmggYi9mcy94ZnMveGZzX2J0cmVl LmgKaW5kZXggYzdmMTg3YS4uZjkzMjg5NyAxMDA2NDQKLS0tIGEvZnMveGZzL3hmc19idHJlZS5o CisrKyBiL2ZzL3hmcy94ZnNfYnRyZWUuaApAQCAtMzgzLDYgKzM4MywxNyBAQCB4ZnNfYnRyZWVf cmVhZGFfYnVmcygKIAl4ZnNfZXh0bGVuX3QJCWNvdW50LAkvKiBjb3VudCBvZiBmaWxlc3lzdGVt IGJsb2NrcyAqLwogCWNvbnN0IHN0cnVjdCB4ZnNfYnVmX29wcyAqb3BzKTsKIAorLyoKKyAqIElu aXRpYWxpc2UgYSBuZXcgYnRyZWUgYmxvY2sgaGVhZGVyCisgKi8KK3ZvaWQKK3hmc19idHJlZV9p bml0X2Jsb2NrKAorCXN0cnVjdCB4ZnNfbW91bnQgKm1wLAorCXN0cnVjdCB4ZnNfYnVmCSpicCwK KwlfX3UzMgkJbWFnaWMsCisJX191MTYJCWxldmVsLAorCV9fdTE2CQludW1yZWNzLAorCXVuc2ln bmVkIGludAlmbGFncyk7CiAKIC8qCiAgKiBDb21tb24gYnRyZWUgY29yZSBlbnRyeSBwb2ludHMu CmRpZmYgLS1naXQgYS9mcy94ZnMveGZzX2Zzb3BzLmMgYi9mcy94ZnMveGZzX2Zzb3BzLmMKaW5k ZXggZjQ3NzcyMy4uMDNhODAzNiAxMDA2NDQKLS0tIGEvZnMveGZzL3hmc19mc29wcy5jCisrKyBi L2ZzL3hmcy94ZnNfZnNvcHMuYwpAQCAtMTIzLDcgKzEyMyw2IEBAIHhmc19ncm93ZnNfZGF0YV9w cml2YXRlKAogCXhmc19leHRsZW5fdAkJYWdzaXplOwogCXhmc19leHRsZW5fdAkJdG1wc2l6ZTsK IAl4ZnNfYWxsb2NfcmVjX3QJCSphcmVjOwotCXN0cnVjdCB4ZnNfYnRyZWVfYmxvY2sJKmJsb2Nr OwogCXhmc19idWZfdAkJKmJwOwogCWludAkJCWJ1Y2tldDsKIAlpbnQJCQlkcGN0OwpAQCAtMjcz LDE3ICsyNzIsMTQgQEAgeGZzX2dyb3dmc19kYXRhX3ByaXZhdGUoCiAJCQllcnJvciA9IEVOT01F TTsKIAkJCWdvdG8gZXJyb3IwOwogCQl9Ci0JCWJsb2NrID0gWEZTX0JVRl9UT19CTE9DSyhicCk7 Ci0JCW1lbXNldChibG9jaywgMCwgbXAtPm1fc2Iuc2JfYmxvY2tzaXplKTsKLQkJYmxvY2stPmJi X21hZ2ljID0gY3B1X3RvX2JlMzIoWEZTX0FCVEJfTUFHSUMpOwotCQlibG9jay0+YmJfbGV2ZWwg PSAwOwotCQlibG9jay0+YmJfbnVtcmVjcyA9IGNwdV90b19iZTE2KDEpOwotCQlibG9jay0+YmJf dS5zLmJiX2xlZnRzaWIgPSBjcHVfdG9fYmUzMihOVUxMQUdCTE9DSyk7Ci0JCWJsb2NrLT5iYl91 LnMuYmJfcmlnaHRzaWIgPSBjcHVfdG9fYmUzMihOVUxMQUdCTE9DSyk7Ci0JCWFyZWMgPSBYRlNf QUxMT0NfUkVDX0FERFIobXAsIGJsb2NrLCAxKTsKKwkJeGZzX2J1Zl96ZXJvKGJwLCAwLCBCQlRP QihicC0+Yl9sZW5ndGgpKTsKKwkJeGZzX2J0cmVlX2luaXRfYmxvY2sobXAsIGJwLCBYRlNfQUJU Ql9NQUdJQywgMCwgMSwgMCk7CisKKwkJYXJlYyA9IFhGU19BTExPQ19SRUNfQUREUihtcCwgWEZT X0JVRl9UT19CTE9DSyhicCksIDEpOwogCQlhcmVjLT5hcl9zdGFydGJsb2NrID0gY3B1X3RvX2Jl MzIoWEZTX1BSRUFMTE9DX0JMT0NLUyhtcCkpOwogCQlhcmVjLT5hcl9ibG9ja2NvdW50ID0gY3B1 X3RvX2JlMzIoCiAJCQlhZ3NpemUgLSBiZTMyX3RvX2NwdShhcmVjLT5hcl9zdGFydGJsb2NrKSk7 CisKIAkJZXJyb3IgPSB4ZnNfYndyaXRlKGJwKTsKIAkJYnAtPmJfb3BzID0gJnhmc19hbGxvY2J0 X2J1Zl9vcHM7CiAJCXhmc19idWZfcmVsc2UoYnApOwpAQCAtMzA1LDE4ICszMDEsMTUgQEAgeGZz X2dyb3dmc19kYXRhX3ByaXZhdGUoCiAJCQllcnJvciA9IEVOT01FTTsKIAkJCWdvdG8gZXJyb3Iw OwogCQl9Ci0JCWJsb2NrID0gWEZTX0JVRl9UT19CTE9DSyhicCk7Ci0JCW1lbXNldChibG9jaywg MCwgbXAtPm1fc2Iuc2JfYmxvY2tzaXplKTsKLQkJYmxvY2stPmJiX21hZ2ljID0gY3B1X3RvX2Jl MzIoWEZTX0FCVENfTUFHSUMpOwotCQlibG9jay0+YmJfbGV2ZWwgPSAwOwotCQlibG9jay0+YmJf bnVtcmVjcyA9IGNwdV90b19iZTE2KDEpOwotCQlibG9jay0+YmJfdS5zLmJiX2xlZnRzaWIgPSBj cHVfdG9fYmUzMihOVUxMQUdCTE9DSyk7Ci0JCWJsb2NrLT5iYl91LnMuYmJfcmlnaHRzaWIgPSBj cHVfdG9fYmUzMihOVUxMQUdCTE9DSyk7Ci0JCWFyZWMgPSBYRlNfQUxMT0NfUkVDX0FERFIobXAs IGJsb2NrLCAxKTsKKwkJeGZzX2J1Zl96ZXJvKGJwLCAwLCBCQlRPQihicC0+Yl9sZW5ndGgpKTsK KwkJeGZzX2J0cmVlX2luaXRfYmxvY2sobXAsIGJwLCBYRlNfQUJUQ19NQUdJQywgMCwgMSwgMCk7 CisKKwkJYXJlYyA9IFhGU19BTExPQ19SRUNfQUREUihtcCwgWEZTX0JVRl9UT19CTE9DSyhicCks IDEpOwogCQlhcmVjLT5hcl9zdGFydGJsb2NrID0gY3B1X3RvX2JlMzIoWEZTX1BSRUFMTE9DX0JM T0NLUyhtcCkpOwogCQlhcmVjLT5hcl9ibG9ja2NvdW50ID0gY3B1X3RvX2JlMzIoCiAJCQlhZ3Np emUgLSBiZTMyX3RvX2NwdShhcmVjLT5hcl9zdGFydGJsb2NrKSk7CiAJCW5mcmVlICs9IGJlMzJf dG9fY3B1KGFyZWMtPmFyX2Jsb2NrY291bnQpOworCiAJCWVycm9yID0geGZzX2J3cml0ZShicCk7 CiAJCWJwLT5iX29wcyA9ICZ4ZnNfYWxsb2NidF9idWZfb3BzOwogCQl4ZnNfYnVmX3JlbHNlKGJw KTsKQEAgLTMzOCwxMyArMzMxLDkgQEAgeGZzX2dyb3dmc19kYXRhX3ByaXZhdGUoCiAJCQllcnJv ciA9IEVOT01FTTsKIAkJCWdvdG8gZXJyb3IwOwogCQl9Ci0JCWJsb2NrID0gWEZTX0JVRl9UT19C TE9DSyhicCk7Ci0JCW1lbXNldChibG9jaywgMCwgbXAtPm1fc2Iuc2JfYmxvY2tzaXplKTsKLQkJ YmxvY2stPmJiX21hZ2ljID0gY3B1X3RvX2JlMzIoWEZTX0lCVF9NQUdJQyk7Ci0JCWJsb2NrLT5i Yl9sZXZlbCA9IDA7Ci0JCWJsb2NrLT5iYl9udW1yZWNzID0gMDsKLQkJYmxvY2stPmJiX3Uucy5i Yl9sZWZ0c2liID0gY3B1X3RvX2JlMzIoTlVMTEFHQkxPQ0spOwotCQlibG9jay0+YmJfdS5zLmJi X3JpZ2h0c2liID0gY3B1X3RvX2JlMzIoTlVMTEFHQkxPQ0spOworCQl4ZnNfYnVmX3plcm8oYnAs IDAsIEJCVE9CKGJwLT5iX2xlbmd0aCkpOworCQl4ZnNfYnRyZWVfaW5pdF9ibG9jayhtcCwgYnAs IFhGU19JQlRfTUFHSUMsIDAsIDAsIDApOworCiAJCWVycm9yID0geGZzX2J3cml0ZShicCk7CiAJ CWJwLT5iX29wcyA9ICZ4ZnNfaW5vYnRfYnVmX29wczsKIAkJeGZzX2J1Zl9yZWxzZShicCk7Ci0t IAoxLjcuMTAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CnhmcyBtYWlsaW5nIGxpc3QKeGZzQG9zcy5zZ2kuY29tCmh0dHA6Ly9vc3Muc2dpLmNvbS9tYWls bWFuL2xpc3RpbmZvL3hmcwo=