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 p0C0i9Sb124899 for ; Tue, 11 Jan 2011 18:44:09 -0600 Received: from mail.internode.on.net (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id A4224256226 for ; Tue, 11 Jan 2011 16:36:37 -0800 (PST) Received: from mail.internode.on.net (bld-mail14.adl6.internode.on.net [150.101.137.99]) by cuda.sgi.com with ESMTP id l1jjowIw1SjpIU3o for ; Tue, 11 Jan 2011 16:36:37 -0800 (PST) Received: from dastard (unverified [121.44.222.102]) by mail.internode.on.net (SurgeMail 3.8f2) with ESMTP id 52939888-1927428 for ; Wed, 12 Jan 2011 11:06:36 +1030 (CDT) Received: from chute ([192.168.1.1] helo=disappointment) by dastard with esmtp (Exim 4.72) (envelope-from ) id 1PcohC-0000UX-9e for xfs@oss.sgi.com; Wed, 12 Jan 2011 11:36:14 +1100 Received: from dave by disappointment with local (Exim 4.72) (envelope-from ) id 1Pcogu-0002GF-Qx for xfs@oss.sgi.com; Wed, 12 Jan 2011 11:35:56 +1100 From: Dave Chinner Subject: [PATCH 06/12] xfs: kill xfs_fs_repair_cmn_err() macro Date: Wed, 12 Jan 2011 11:35:47 +1100 Message-Id: <1294792553-8378-7-git-send-email-david@fromorbit.com> In-Reply-To: <1294792553-8378-1-git-send-email-david@fromorbit.com> References: <1294792553-8378-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 RnJvbTogRGF2ZSBDaGlubmVyIDxkY2hpbm5lckByZWRoYXQuY29tPgoKSW4gY2VydGFpbiBjYXNl cyBvZiBpbm9kZSBjb3JydXB0aW9uLCB0aGUgeGZzX2ZzX3JlcGFpcl9jbW5fZXJyKCkKbWFjcm8g aXMgdXNlZCB0byBvdXRwdXQgYW4gZXh0cmEgbWVzc2FnZSBpbiB0aGUgY29ycnVwdGlvbiByZXBv cnQuClRoYXQgZXh0cmEgbWVzc2FnZSBpcyAidW5tb3VudCBhbmQgcnVuIHhmc19yZXBhaXIiLCB3 aGljaCByZWFsbHkKYXBwbGllcyB0byBhbnkgY29ycnVwdGlvbiByZXBvcnQuIEVhY2ggY2FzZSB0 aGF0IHRoaXMgbWFjcm8gaXMKY2FsbGVkIChleGNlcHQgb25lKSB0aGVuIGNhbGxzIHhmc19jb3Jy dXB0aW9uX2Vycm9yKCkgdG8gb3B0aW9uYWxseQpkdW1wIG1vcmUgaW5mb3JtYXRpb24gYWJvdXQg dGhlIGVycm9yLgoKSGVuY2UsIG1vdmUgdGhlIG91dHB1dCBvZiAicnVuIHhmc19yZXBhaXIiIHRv IHhmc19jb3JydXB0aW9uX2Vycm9yKCkKc28gdGhhdCBpdCBpcyBvdXRwdXQgb24gYWxsIGNvcnJ1 cHRpb24gcmVwb3J0cyBhcyBpdCBpcyByZWxldmFudCB0bwphbGwgY29ycnVwdGlvbiBpbmNpZGVu dHMuIEFsc28sIGNvbnZlcnQgdGhlIG9uZSBjYWxsZXIgb2YgdGhlCmZzX3JlcGFpciBtYWNybyB0 aGF0IGRvZXNuJ3QgY2FsbCB4ZnNfY29ycnVwdGlvbl9lcnJvcigpIHRvIGNhbGwgaXQsCmhlbmNl IHByb3ZpZGUgY29uc2nRlXRlbnQgZXJyb3IgcmVwb3J0aW5nIGZvciBhbGwgY2FzZXMgd2hlcmUK eGZzX2ZzX3JlcGFpcl9jbW5fZXJyKCkgdXNlZCB0byBiZSBjYWxsZWQuCgpTaWduZWQtb2ZmLWJ5 OiBEYXZlIENoaW5uZXIgPGRjaGlubmVyQHJlZGhhdC5jb20+Ci0tLQogZnMveGZzL3hmc19ibWFw LmMgIHwgICAgNyArKystLS0tCiBmcy94ZnMveGZzX2Vycm9yLmMgfCAgICAxICsKIGZzL3hmcy94 ZnNfZXJyb3IuaCB8ICAgIDMgLS0tCiBmcy94ZnMveGZzX2lub2RlLmMgfCAgIDM3ICsrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0 aW9ucygrKSwgMjkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZnMveGZzL3hmc19ibWFwLmMg Yi9mcy94ZnMveGZzX2JtYXAuYwppbmRleCA1MDBjNWM3Li44NzkxOWUxIDEwMDY0NAotLS0gYS9m cy94ZnMveGZzX2JtYXAuYworKysgYi9mcy94ZnMveGZzX2JtYXAuYwpAQCAtNDE3NCwxMiArNDE3 NCwxMSBAQCB4ZnNfYm1hcF9yZWFkX2V4dGVudHMoCiAJCW51bV9yZWNzID0geGZzX2J0cmVlX2dl dF9udW1yZWNzKGJsb2NrKTsKIAkJaWYgKHVubGlrZWx5KGkgKyBudW1fcmVjcyA+IHJvb20pKSB7 CiAJCQlBU1NFUlQoaSArIG51bV9yZWNzIDw9IHJvb20pOwotCQkJeGZzX2ZzX3JlcGFpcl9jbW5f ZXJyKENFX1dBUk4sIGlwLT5pX21vdW50LAorCQkJeGZzX3dhcm4oaXAtPmlfbW91bnQsCiAJCQkJ ImNvcnJ1cHQgZGlub2RlICVMdSwgKGJ0cmVlIGV4dGVudHMpLiIsCiAJCQkJKHVuc2lnbmVkIGxv bmcgbG9uZykgaXAtPmlfaW5vKTsKLQkJCVhGU19FUlJPUl9SRVBPUlQoInhmc19ibWFwX3JlYWRf ZXh0ZW50cygxKSIsCi0JCQkJCSBYRlNfRVJSTEVWRUxfTE9XLAotCQkJCQlpcC0+aV9tb3VudCk7 CisJCQlYRlNfQ09SUlVQVElPTl9FUlJPUigieGZzX2JtYXBfcmVhZF9leHRlbnRzKDEpIiwKKwkJ CQlYRlNfRVJSTEVWRUxfTE9XLCBpcC0+aV9tb3VudCwgYmxvY2spOwogCQkJZ290byBlcnJvcjA7 CiAJCX0KIAkJWEZTX1dBTlRfQ09SUlVQVEVEX0dPVE8oCmRpZmYgLS1naXQgYS9mcy94ZnMveGZz X2Vycm9yLmMgYi9mcy94ZnMveGZzX2Vycm9yLmMKaW5kZXggMzRmMGUyZC4uMDMwMjg5MCAxMDA2 NDQKLS0tIGEvZnMveGZzL3hmc19lcnJvci5jCisrKyBiL2ZzL3hmcy94ZnNfZXJyb3IuYwpAQCAt MTgzLDQgKzE4Myw1IEBAIHhmc19jb3JydXB0aW9uX2Vycm9yKAogCWlmIChsZXZlbCA8PSB4ZnNf ZXJyb3JfbGV2ZWwpCiAJCXhmc19oZXhfZHVtcChwLCAxNik7CiAJeGZzX2Vycm9yX3JlcG9ydCh0 YWcsIGxldmVsLCBtcCwgZmlsZW5hbWUsIGxpbmVudW0sIHJhKTsKKwl4ZnNfYWxlcnQobXAsICJD b3JydXB0aW9uIGRldGVjdGVkLiBVbm1vdW50IGFuZCBydW4geGZzX3JlcGFpciIpOwogfQpkaWZm IC0tZ2l0IGEvZnMveGZzL3hmc19lcnJvci5oIGIvZnMveGZzL3hmc19lcnJvci5oCmluZGV4IGUx YmEyZDIuLjRjOGI1MDAgMTAwNjQ0Ci0tLSBhL2ZzL3hmcy94ZnNfZXJyb3IuaAorKysgYi9mcy94 ZnMveGZzX2Vycm9yLmgKQEAgLTE2Miw5ICsxNjIsNiBAQCBzdHJ1Y3QgeGZzX21vdW50OwogCiBl eHRlcm4gdm9pZCB4ZnNfaGV4X2R1bXAodm9pZCAqcCwgaW50IGxlbmd0aCk7CiAKLSNkZWZpbmUg eGZzX2ZzX3JlcGFpcl9jbW5fZXJyKGxldmVsLCBtcCwgZm10LCBhcmdzLi4uKSBcCi0JeGZzX2Zz X2Ntbl9lcnIobGV2ZWwsIG1wLCBmbXQgIiAgVW5tb3VudCBhbmQgcnVuIHhmc19yZXBhaXIuIiwg IyMgYXJncykKLQogI2RlZmluZSB4ZnNfZnNfbW91bnRfY21uX2VycihmLCBmbXQsIGFyZ3MuLi4p IFwKIAlkbyB7IFwKIAkJaWYgKCEoZiAmIFhGU19NRlNJX1FVSUVUKSkgCVwKZGlmZiAtLWdpdCBh L2ZzL3hmcy94ZnNfaW5vZGUuYyBiL2ZzL3hmcy94ZnNfaW5vZGUuYwppbmRleCBhMDM1ZmE4Li44 NWM1NDEwIDEwMDY0NAotLS0gYS9mcy94ZnMveGZzX2lub2RlLmMKKysrIGIvZnMveGZzL3hmc19p bm9kZS5jCkBAIC0zMTcsNyArMzE3LDcgQEAgeGZzX2lmb3JtYXQoCiAJaWYgKHVubGlrZWx5KGJl MzJfdG9fY3B1KGRpcC0+ZGlfbmV4dGVudHMpICsKIAkJICAgICBiZTE2X3RvX2NwdShkaXAtPmRp X2FuZXh0ZW50cykgPgogCQkgICAgIGJlNjRfdG9fY3B1KGRpcC0+ZGlfbmJsb2NrcykpKSB7Ci0J CXhmc19mc19yZXBhaXJfY21uX2VycihDRV9XQVJOLCBpcC0+aV9tb3VudCwKKwkJeGZzX3dhcm4o aXAtPmlfbW91bnQsCiAJCQkiY29ycnVwdCBkaW5vZGUgJUx1LCBleHRlbnQgdG90YWwgPSAlZCwg bmJsb2NrcyA9ICVMdS4iLAogCQkJKHVuc2lnbmVkIGxvbmcgbG9uZylpcC0+aV9pbm8sCiAJCQko aW50KShiZTMyX3RvX2NwdShkaXAtPmRpX25leHRlbnRzKSArCkBAIC0zMzAsOCArMzMwLDcgQEAg eGZzX2lmb3JtYXQoCiAJfQogCiAJaWYgKHVubGlrZWx5KGRpcC0+ZGlfZm9ya29mZiA+IGlwLT5p X21vdW50LT5tX3NiLnNiX2lub2Rlc2l6ZSkpIHsKLQkJeGZzX2ZzX3JlcGFpcl9jbW5fZXJyKENF X1dBUk4sIGlwLT5pX21vdW50LAotCQkJImNvcnJ1cHQgZGlub2RlICVMdSwgZm9ya29mZiA9IDB4 JXguIiwKKwkJeGZzX3dhcm4oaXAtPmlfbW91bnQsICJjb3JydXB0IGRpbm9kZSAlTHUsIGZvcmtv ZmYgPSAweCV4LiIsCiAJCQkodW5zaWduZWQgbG9uZyBsb25nKWlwLT5pX2lubywKIAkJCWRpcC0+ ZGlfZm9ya29mZik7CiAJCVhGU19DT1JSVVBUSU9OX0VSUk9SKCJ4ZnNfaWZvcm1hdCgyKSIsIFhG U19FUlJMRVZFTF9MT1csCkBAIC0zNDEsNyArMzQwLDcgQEAgeGZzX2lmb3JtYXQoCiAKIAlpZiAo dW5saWtlbHkoKGlwLT5pX2QuZGlfZmxhZ3MgJiBYRlNfRElGTEFHX1JFQUxUSU1FKSAmJgogCQkg ICAgICFpcC0+aV9tb3VudC0+bV9ydGRldl90YXJncCkpIHsKLQkJeGZzX2ZzX3JlcGFpcl9jbW5f ZXJyKENFX1dBUk4sIGlwLT5pX21vdW50LAorCQl4ZnNfd2FybihpcC0+aV9tb3VudCwKIAkJCSJj b3JydXB0IGRpbm9kZSAlTHUsIGhhcyByZWFsdGltZSBmbGFnIHNldC4iLAogCQkJaXAtPmlfaW5v KTsKIAkJWEZTX0NPUlJVUFRJT05fRVJST1IoInhmc19pZm9ybWF0KHJlYWx0aW1lKSIsCkBAIC0z NzMsOSArMzcyLDggQEAgeGZzX2lmb3JtYXQoCiAJCQkgKiBubyBsb2NhbCByZWd1bGFyIGZpbGVz IHlldAogCQkJICovCiAJCQlpZiAodW5saWtlbHkoKGJlMTZfdG9fY3B1KGRpcC0+ZGlfbW9kZSkg JiBTX0lGTVQpID09IFNfSUZSRUcpKSB7Ci0JCQkJeGZzX2ZzX3JlcGFpcl9jbW5fZXJyKENFX1dB Uk4sIGlwLT5pX21vdW50LAotCQkJCQkiY29ycnVwdCBpbm9kZSAlTHUgIgotCQkJCQkiKGxvY2Fs IGZvcm1hdCBmb3IgcmVndWxhciBmaWxlKS4iLAorCQkJCXhmc193YXJuKGlwLT5pX21vdW50LAor CQkJImNvcnJ1cHQgaW5vZGUgJUx1IChsb2NhbCBmb3JtYXQgZm9yIHJlZ3VsYXIgZmlsZSkuIiwK IAkJCQkJKHVuc2lnbmVkIGxvbmcgbG9uZykgaXAtPmlfaW5vKTsKIAkJCQlYRlNfQ09SUlVQVElP Tl9FUlJPUigieGZzX2lmb3JtYXQoNCkiLAogCQkJCQkJICAgICBYRlNfRVJSTEVWRUxfTE9XLApA QCAtMzg1LDkgKzM4Myw4IEBAIHhmc19pZm9ybWF0KAogCiAJCQlkaV9zaXplID0gYmU2NF90b19j cHUoZGlwLT5kaV9zaXplKTsKIAkJCWlmICh1bmxpa2VseShkaV9zaXplID4gWEZTX0RGT1JLX0RT SVpFKGRpcCwgaXAtPmlfbW91bnQpKSkgewotCQkJCXhmc19mc19yZXBhaXJfY21uX2VycihDRV9X QVJOLCBpcC0+aV9tb3VudCwKLQkJCQkJImNvcnJ1cHQgaW5vZGUgJUx1ICIKLQkJCQkJIihiYWQg c2l6ZSAlTGQgZm9yIGxvY2FsIGlub2RlKS4iLAorCQkJCXhmc193YXJuKGlwLT5pX21vdW50LAor CQkJImNvcnJ1cHQgaW5vZGUgJUx1IChiYWQgc2l6ZSAlTGQgZm9yIGxvY2FsIGlub2RlKS4iLAog CQkJCQkodW5zaWduZWQgbG9uZyBsb25nKSBpcC0+aV9pbm8sCiAJCQkJCShsb25nIGxvbmcpIGRp X3NpemUpOwogCQkJCVhGU19DT1JSVVBUSU9OX0VSUk9SKCJ4ZnNfaWZvcm1hdCg1KSIsCkBAIC00 MzEsOSArNDI4LDggQEAgeGZzX2lmb3JtYXQoCiAJCXNpemUgPSBiZTE2X3RvX2NwdShhdHAtPmhk ci50b3RzaXplKTsKIAogCQlpZiAodW5saWtlbHkoc2l6ZSA8IHNpemVvZihzdHJ1Y3QgeGZzX2F0 dHJfc2ZfaGRyKSkpIHsKLQkJCXhmc19mc19yZXBhaXJfY21uX2VycihDRV9XQVJOLCBpcC0+aV9t b3VudCwKLQkJCQkiY29ycnVwdCBpbm9kZSAlTHUgIgotCQkJCSIoYmFkIGF0dHIgZm9yayBzaXpl ICVMZCkuIiwKKwkJCXhmc193YXJuKGlwLT5pX21vdW50LAorCQkJCSJjb3JydXB0IGlub2RlICVM dSAoYmFkIGF0dHIgZm9yayBzaXplICVMZCkuIiwKIAkJCQkodW5zaWduZWQgbG9uZyBsb25nKSBp cC0+aV9pbm8sCiAJCQkJKGxvbmcgbG9uZykgc2l6ZSk7CiAJCQlYRlNfQ09SUlVQVElPTl9FUlJP UigieGZzX2lmb3JtYXQoOCkiLApAQCAtNDg4LDkgKzQ4NCw4IEBAIHhmc19pZm9ybWF0X2xvY2Fs KAogCSAqIGttZW1fYWxsb2MoKSBvciBtZW1jcHkoKSBiZWxvdy4KIAkgKi8KIAlpZiAodW5saWtl bHkoc2l6ZSA+IFhGU19ERk9SS19TSVpFKGRpcCwgaXAtPmlfbW91bnQsIHdoaWNoZm9yaykpKSB7 Ci0JCXhmc19mc19yZXBhaXJfY21uX2VycihDRV9XQVJOLCBpcC0+aV9tb3VudCwKLQkJCSJjb3Jy dXB0IGlub2RlICVMdSAiCi0JCQkiKGJhZCBzaXplICVkIGZvciBsb2NhbCBmb3JrLCBzaXplID0g JWQpLiIsCisJCXhmc193YXJuKGlwLT5pX21vdW50LAorCSJjb3JydXB0IGlub2RlICVMdSAoYmFk IHNpemUgJWQgZm9yIGxvY2FsIGZvcmssIHNpemUgPSAlZCkuIiwKIAkJCSh1bnNpZ25lZCBsb25n IGxvbmcpIGlwLT5pX2lubywgc2l6ZSwKIAkJCVhGU19ERk9SS19TSVpFKGRpcCwgaXAtPmlfbW91 bnQsIHdoaWNoZm9yaykpOwogCQlYRlNfQ09SUlVQVElPTl9FUlJPUigieGZzX2lmb3JtYXRfbG9j YWwiLCBYRlNfRVJSTEVWRUxfTE9XLApAQCAtNTQ3LDggKzU0Miw3IEBAIHhmc19pZm9ybWF0X2V4 dGVudHMoCiAJICoga21lbV9hbGxvYygpIG9yIG1lbWNweSgpIGJlbG93LgogCSAqLwogCWlmICh1 bmxpa2VseShzaXplIDwgMCB8fCBzaXplID4gWEZTX0RGT1JLX1NJWkUoZGlwLCBpcC0+aV9tb3Vu dCwgd2hpY2hmb3JrKSkpIHsKLQkJeGZzX2ZzX3JlcGFpcl9jbW5fZXJyKENFX1dBUk4sIGlwLT5p X21vdW50LAotCQkJImNvcnJ1cHQgaW5vZGUgJUx1ICgoYSlleHRlbnRzID0gJWQpLiIsCisJCXhm c193YXJuKGlwLT5pX21vdW50LCAiY29ycnVwdCBpbm9kZSAlTHUgKChhKWV4dGVudHMgPSAlZCku IiwKIAkJCSh1bnNpZ25lZCBsb25nIGxvbmcpIGlwLT5pX2lubywgbmV4KTsKIAkJWEZTX0NPUlJV UFRJT05fRVJST1IoInhmc19pZm9ybWF0X2V4dGVudHMoMSkiLCBYRlNfRVJSTEVWRUxfTE9XLAog CQkJCSAgICAgaXAtPmlfbW91bnQsIGRpcCk7CkBAIC02MjMsMTEgKzYxNywxMCBAQCB4ZnNfaWZv cm1hdF9idHJlZSgKIAkgICAgfHwgWEZTX0JNRFJfU1BBQ0VfQ0FMQyhucmVjcykgPgogCQkJWEZT X0RGT1JLX1NJWkUoZGlwLCBpcC0+aV9tb3VudCwgd2hpY2hmb3JrKQogCSAgICB8fCBYRlNfSUZP UktfTkVYVEVOVFMoaXAsIHdoaWNoZm9yaykgPiBpcC0+aV9kLmRpX25ibG9ja3MpKSB7Ci0JCXhm c19mc19yZXBhaXJfY21uX2VycihDRV9XQVJOLCBpcC0+aV9tb3VudCwKLQkJCSJjb3JydXB0IGlu b2RlICVMdSAoYnRyZWUpLiIsCisJCXhmc193YXJuKGlwLT5pX21vdW50LCAiY29ycnVwdCBpbm9k ZSAlTHUgKGJ0cmVlKS4iLAogCQkJKHVuc2lnbmVkIGxvbmcgbG9uZykgaXAtPmlfaW5vKTsKLQkJ WEZTX0VSUk9SX1JFUE9SVCgieGZzX2lmb3JtYXRfYnRyZWUiLCBYRlNfRVJSTEVWRUxfTE9XLAot CQkJCSBpcC0+aV9tb3VudCk7CisJCVhGU19DT1JSVVBUSU9OX0VSUk9SKCJ4ZnNfaWZvcm1hdF9i dHJlZSIsIFhGU19FUlJMRVZFTF9MT1csCisJCQkJIGlwLT5pX21vdW50LCBkaXApOwogCQlyZXR1 cm4gWEZTX0VSUk9SKEVGU0NPUlJVUFRFRCk7CiAJfQogCi0tIAoxLjcuMi4zCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwp4ZnMgbWFpbGluZyBsaXN0Cnhm c0Bvc3Muc2dpLmNvbQpodHRwOi8vb3NzLnNnaS5jb20vbWFpbG1hbi9saXN0aW5mby94ZnMK