From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brandon Berhent Subject: Fix reiser4 compile warnings Date: Sat, 12 Sep 2009 23:34:00 -0400 Message-ID: <9bb377710909122034mb8da551x299032990230efe0@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=0016e64ba3fa52745604736d38e3 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=Dm30Kr4Y1BmLbVxClh2bMy1s/xQJg5Dz2O3wZ8kLgt4=; b=o1RfTPgpGl+mKs03atPvgxl+cuA/SM52CMZHj8ZRASc4YgGE0a7wLacyNg8qyAOZjv DgVOwSd0/3H0w+vQ4AOwXG9SDyycs61qedDsv2x5B9nk49SOkEsQYp9WgHAp6jHXBeSO ycJq4/OFpYK04W3QoCGPCrjjxECKLr8Ggh3uY= Sender: reiserfs-devel-owner@vger.kernel.org List-ID: To: reiserfs-devel@vger.kernel.org --0016e64ba3fa52745604736d38e3 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Please check the attached patch for correctness It fixes the following warnings on compile: CC fs/reiser4/plugin/compress/compress.o fs/reiser4/plugin/compress/compress.c: In function =91lzo1_compress=92: fs/reiser4/plugin/compress/compress.c:289: warning: passing argument 4 of =91lzo1x_1_compress=92 from incompatible pointer type fs/reiser4/plugin/compress/compress.c: In function =91lzo1_decompress=92: fs/reiser4/plugin/compress/compress.c:313: warning: passing argument 4 of =91lzo1x_decompress_safe=92 from incompatible pointer type CC fs/reiser4/plugin/item/item.o fs/reiser4/plugin/item/item.c:556: warning: initialization from incompatible pointer type fs/reiser4/plugin/item/item.c:609: warning: initialization from incompatible pointer type I am not the original other of this patch, please consider it if it is correct :) --0016e64ba3fa52745604736d38e3 Content-Type: text/x-diff; charset=US-ASCII; name="r4-fix-compile-warnings.diff" Content-Disposition: attachment; filename="r4-fix-compile-warnings.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fzj89eia0 ZGlmZiAtLWdpdCBhL2ZzL3JlaXNlcjQvcGx1Z2luL2NvbXByZXNzL2NvbXByZXNzLmMgYi9mcy9y ZWlzZXI0L3BsdWdpbi9jb21wcmVzcy9jb21wcmVzcy5jCmluZGV4IDk5ZjMxMDcuLjgyODRlMzYg MTAwNjQ0Ci0tLSBhL2ZzL3JlaXNlcjQvcGx1Z2luL2NvbXByZXNzL2NvbXByZXNzLmMKKysrIGIv ZnMvcmVpc2VyNC9wbHVnaW4vY29tcHJlc3MvY29tcHJlc3MuYwpAQCAtMTIyLDggKzEyMiw4IEBA IHN0YXRpYyBpbnQgZ3ppcDFfbWluX3NpemVfZGVmbGF0ZSh2b2lkKQogfQogCiBzdGF0aWMgdm9p ZAotZ3ppcDFfY29tcHJlc3MoY29hX3QgY29hLCBfX3U4ICogc3JjX2ZpcnN0LCB1bnNpZ25lZCBz cmNfbGVuLAotCSAgICAgICBfX3U4ICogZHN0X2ZpcnN0LCB1bnNpZ25lZCAqZHN0X2xlbikKK2d6 aXAxX2NvbXByZXNzKGNvYV90IGNvYSwgX191OCAqIHNyY19maXJzdCwgc2l6ZV90IHNyY19sZW4s CisJICAgICAgIF9fdTggKiBkc3RfZmlyc3QsIHNpemVfdCAqZHN0X2xlbikKIHsKICNpZiBSRUlT RVI0X1pMSUIKIAlpbnQgcmV0ID0gMDsKQEAgLTE2Niw4ICsxNjYsOCBAQCBnemlwMV9jb21wcmVz cyhjb2FfdCBjb2EsIF9fdTggKiBzcmNfZmlyc3QsIHVuc2lnbmVkIHNyY19sZW4sCiB9CiAKIHN0 YXRpYyB2b2lkCi1nemlwMV9kZWNvbXByZXNzKGNvYV90IGNvYSwgX191OCAqIHNyY19maXJzdCwg dW5zaWduZWQgc3JjX2xlbiwKLQkJIF9fdTggKiBkc3RfZmlyc3QsIHVuc2lnbmVkICpkc3RfbGVu KQorZ3ppcDFfZGVjb21wcmVzcyhjb2FfdCBjb2EsIF9fdTggKiBzcmNfZmlyc3QsIHNpemVfdCBz cmNfbGVuLAorCQkgX191OCAqIGRzdF9maXJzdCwgc2l6ZV90ICpkc3RfbGVuKQogewogI2lmIFJF SVNFUjRfWkxJQgogCWludCByZXQgPSAwOwpAQCAtMjc4LDggKzI3OCw4IEBAIHN0YXRpYyBpbnQg bHpvMV9taW5fc2l6ZV9kZWZsYXRlKHZvaWQpCiB9CiAKIHN0YXRpYyB2b2lkCi1sem8xX2NvbXBy ZXNzKGNvYV90IGNvYSwgX191OCAqIHNyY19maXJzdCwgdW5zaWduZWQgc3JjX2xlbiwKLQkgICAg ICBfX3U4ICogZHN0X2ZpcnN0LCB1bnNpZ25lZCAqZHN0X2xlbikKK2x6bzFfY29tcHJlc3MoY29h X3QgY29hLCBfX3U4ICogc3JjX2ZpcnN0LCBzaXplX3Qgc3JjX2xlbiwKKwkgICAgICBfX3U4ICog ZHN0X2ZpcnN0LCBzaXplX3QgKmRzdF9sZW4pCiB7CiAJaW50IHJlc3VsdDsKIApAQCAtMzAyLDgg KzMwMiw4IEBAIGx6bzFfY29tcHJlc3MoY29hX3QgY29hLCBfX3U4ICogc3JjX2ZpcnN0LCB1bnNp Z25lZCBzcmNfbGVuLAogfQogCiBzdGF0aWMgdm9pZAotbHpvMV9kZWNvbXByZXNzKGNvYV90IGNv YSwgX191OCAqIHNyY19maXJzdCwgdW5zaWduZWQgc3JjX2xlbiwKLQkJX191OCAqIGRzdF9maXJz dCwgdW5zaWduZWQgKmRzdF9sZW4pCitsem8xX2RlY29tcHJlc3MoY29hX3QgY29hLCBfX3U4ICog c3JjX2ZpcnN0LCBzaXplX3Qgc3JjX2xlbiwKKwkJX191OCAqIGRzdF9maXJzdCwgc2l6ZV90ICpk c3RfbGVuKQogewogCWludCByZXN1bHQ7CiAKZGlmZiAtLWdpdCBhL2ZzL3JlaXNlcjQvcGx1Z2lu L2ZpbGUvY3J5cHRjb21wcmVzcy5jIGIvZnMvcmVpc2VyNC9wbHVnaW4vZmlsZS9jcnlwdGNvbXBy ZXNzLmMKaW5kZXggZDdhOTEwMS4uMzVhNjgzMyAxMDA2NDQKLS0tIGEvZnMvcmVpc2VyNC9wbHVn aW4vZmlsZS9jcnlwdGNvbXByZXNzLmMKKysrIGIvZnMvcmVpc2VyNC9wbHVnaW4vZmlsZS9jcnlw dGNvbXByZXNzLmMKQEAgLTEwMTQsNyArMTAxNCw3IEBAIGludCByZWlzZXI0X2RlZmxhdGVfY2x1 c3RlcihzdHJ1Y3QgY2x1c3Rlcl9oYW5kbGUgKiBjbHVzdCwgc3RydWN0IGlub2RlICogaW5vZGUp CiAJY29wbHVnID0gaW5vZGVfY29tcHJlc3Npb25fcGx1Z2luKGlub2RlKTsKIAlpZiAoc2hvdWxk X2NvbXByZXNzKHRjLCBjbHVzdC0+aW5kZXgsIGlub2RlKSkgewogCQkvKiB0cnkgdG8gY29tcHJl c3MsIGRpc2NhcmQgYmFkIHJlc3VsdHMgKi8KLQkJX191MzIgZHN0X2xlbjsKKwkJc2l6ZV90IGRz dF9sZW47CiAJCWNvbXByZXNzaW9uX21vZGVfcGx1Z2luICogbXBsdWcgPQogCQkJaW5vZGVfY29t cHJlc3Npb25fbW9kZV9wbHVnaW4oaW5vZGUpOwogCQlhc3NlcnQoImVkd2FyZC02MDIiLCBjb3Bs dWcgIT0gTlVMTCk7CkBAIC0xMTY0LDcgKzExNjQsNyBAQCBpbnQgcmVpc2VyNF9pbmZsYXRlX2Ns dXN0ZXIoc3RydWN0IGNsdXN0ZXJfaGFuZGxlICogY2x1c3QsIHN0cnVjdCBpbm9kZSAqIGlub2Rl KQogCQl0cmFuc2Zvcm1lZCA9IDE7CiAJfQogCWlmIChuZWVkX2luZmxhdGUoY2x1c3QsIGlub2Rl LCAwKSkgewotCQl1bnNpZ25lZCBkc3RfbGVuID0gaW5vZGVfY2x1c3Rlcl9zaXplKGlub2RlKTsK KwkJc2l6ZV90IGRzdF9sZW4gPSBpbm9kZV9jbHVzdGVyX3NpemUoaW5vZGUpOwogCQlpZih0cmFu c2Zvcm1lZCkKIAkJCWFsdGVybmF0ZV9zdHJlYW1zKHRjKTsKIApkaWZmIC0tZ2l0IGEvZnMvcmVp c2VyNC9wbHVnaW4vZmlsZS9maWxlX2NvbnZlcnNpb24uYyBiL2ZzL3JlaXNlcjQvcGx1Z2luL2Zp bGUvZmlsZV9jb252ZXJzaW9uLmMKaW5kZXggYmQ2ZWExNS4uMzZhNmQwOCAxMDA2NDQKLS0tIGEv ZnMvcmVpc2VyNC9wbHVnaW4vZmlsZS9maWxlX2NvbnZlcnNpb24uYworKysgYi9mcy9yZWlzZXI0 L3BsdWdpbi9maWxlL2ZpbGVfY29udmVyc2lvbi5jCkBAIC0zMDUsNyArMzA1LDcgQEAgc3RhdGlj IGludCByZWFkX2NoZWNrX2NvbXByZXNzaWJpbGl0eShzdHJ1Y3QgaW5vZGUgKiBpbm9kZSwKIHsK IAlpbnQgaTsKIAlpbnQgcmVzdWx0OwotCV9fdTMyIGRzdF9sZW47CisJc2l6ZV90IGRzdF9sZW47 CiAJaGludF90IHRtcF9oaW50OwogCWhpbnRfdCAqIGN1cl9oaW50ID0gY2x1c3QtPmhpbnQ7CiAJ YXNzZXJ0KCJlZHdhcmQtMTU0MSIsIGNvbnQtPnN0YXRlID09IFBTQ0hFRF9TQ0hFRF9QT0lOVCk7 CmRpZmYgLS1naXQgYS9mcy9yZWlzZXI0L3BsdWdpbi9pdGVtL2l0ZW0uaCBiL2ZzL3JlaXNlcjQv cGx1Z2luL2l0ZW0vaXRlbS5oCmluZGV4IDg2NGVkYWUuLjU5OTg3MDEgMTAwNjQ0Ci0tLSBhL2Zz L3JlaXNlcjQvcGx1Z2luL2l0ZW0vaXRlbS5oCisrKyBiL2ZzL3JlaXNlcjQvcGx1Z2luL2l0ZW0v aXRlbS5oCkBAIC0yMzMsOCArMjMzLDggQEAgc3RydWN0IGRpcl9lbnRyeV9pb3BzIHsKIAogLyog b3BlcmF0aW9ucyBzcGVjaWZpYyB0byBpdGVtcyByZWd1bGFyICh1bml4KSBmaWxlIG1ldGFkYXRh IGFyZSBidWlsdCBvZiAqLwogc3RydWN0IGZpbGVfaW9wc3sKLQlpbnQgKCp3cml0ZSkgKHN0cnVj dCBmaWxlICosIHN0cnVjdCBpbm9kZSAqLAotCQkgICAgICBjb25zdCBjaGFyIF9fdXNlciAqLCBz aXplX3QsIGxvZmZfdCAqcG9zKTsKKwlzc2l6ZV90ICgqd3JpdGUpIChzdHJ1Y3QgZmlsZSAqLCBz dHJ1Y3QgaW5vZGUgKiwKKwkJCSAgY29uc3QgY2hhciBfX3VzZXIgKiwgc2l6ZV90LCBsb2ZmX3Qg KnBvcyk7CiAJaW50ICgqcmVhZCkgKHN0cnVjdCBmaWxlICosIGZsb3dfdCAqLCBoaW50X3QgKik7 CiAJaW50ICgqcmVhZHBhZ2UpICh2b2lkICosIHN0cnVjdCBwYWdlICopOwogCWludCAoKmdldF9i bG9jaykgKGNvbnN0IGNvb3JkX3QgKiwgc2VjdG9yX3QsIHNlY3Rvcl90ICopOwpkaWZmIC0tZ2l0 IGEvZnMvcmVpc2VyNC9wbHVnaW4vcGx1Z2luLmggYi9mcy9yZWlzZXI0L3BsdWdpbi9wbHVnaW4u aAppbmRleCA3NmVmNTZjLi44MmZhNjZhIDEwMDY0NAotLS0gYS9mcy9yZWlzZXI0L3BsdWdpbi9w bHVnaW4uaAorKysgYi9mcy9yZWlzZXI0L3BsdWdpbi9wbHVnaW4uaApAQCAtNTYwLDEwICs1NjAs MTAgQEAgdHlwZWRlZiBzdHJ1Y3QgY29tcHJlc3Npb25fcGx1Z2luIHsKIAlpbnQgKCptaW5fc2l6 ZV9kZWZsYXRlKSAodm9pZCk7CiAJIF9fdTMyKCpjaGVja3N1bSkgKGNoYXIgKmRhdGEsIF9fdTMy IGxlbmd0aCk7CiAJLyogbWFpbiB0cmFuc2Zvcm0gcHJvY2VkdXJlcyAqLwotCXZvaWQgKCpjb21w cmVzcykgKGNvYV90IGNvYSwgX191OCAqc3JjX2ZpcnN0LCB1bnNpZ25lZCBzcmNfbGVuLAotCQkJ ICBfX3U4ICpkc3RfZmlyc3QsIHVuc2lnbmVkICpkc3RfbGVuKTsKLQl2b2lkICgqZGVjb21wcmVz cykgKGNvYV90IGNvYSwgX191OCAqc3JjX2ZpcnN0LCB1bnNpZ25lZCBzcmNfbGVuLAotCQkJICAg IF9fdTggKmRzdF9maXJzdCwgdW5zaWduZWQgKmRzdF9sZW4pOworCXZvaWQgKCpjb21wcmVzcykg KGNvYV90IGNvYSwgX191OCAqc3JjX2ZpcnN0LCBzaXplX3Qgc3JjX2xlbiwKKwkJCSAgX191OCAq ZHN0X2ZpcnN0LCBzaXplX3QgKmRzdF9sZW4pOworCXZvaWQgKCpkZWNvbXByZXNzKSAoY29hX3Qg Y29hLCBfX3U4ICpzcmNfZmlyc3QsIHNpemVfdCBzcmNfbGVuLAorCQkJICAgIF9fdTggKmRzdF9m aXJzdCwgc2l6ZV90ICpkc3RfbGVuKTsKIH0gY29tcHJlc3Npb25fcGx1Z2luOwogCiB0eXBlZGVm IHN0cnVjdCBjb21wcmVzc2lvbl9tb2RlX3BsdWdpbiB7Cg== --0016e64ba3fa52745604736d38e3--