From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1OdxHD-0006Aw-TB for mharc-grub-devel@gnu.org; Tue, 27 Jul 2010 23:25:51 -0400 Received: from [140.186.70.92] (port=57980 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdxHA-0006AZ-5y for Grub-devel@gnu.org; Tue, 27 Jul 2010 23:25:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OdxH8-0004V5-HH for Grub-devel@gnu.org; Tue, 27 Jul 2010 23:25:48 -0400 Received: from mail-yw0-f41.google.com ([209.85.213.41]:34657) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdxH8-0004V0-BO for Grub-devel@gnu.org; Tue, 27 Jul 2010 23:25:46 -0400 Received: by ywg8 with SMTP id 8so917143ywg.0 for ; Tue, 27 Jul 2010 20:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:from:date :message-id:subject:to:cc:content-type; bh=CicVSzkag4rjT8NaR0B8tqf262n3h2XPwvIYy7rzbDc=; b=VcV3hez0sUB4eMxtbfksz/xXUvGvynIxAVzBmrO+wLLSM5HRXJvwkDiPEEDk9MQBBy 6yFU36pHgLtKzb7tzUkuJ1lRrc8p/gGjNnHmTAAzpaxDcoKUNdNy0eRjQzyFWKVbqI7P nBdXi8y6PVW54/UfpBhA3uSQY6B35OJSo1CV4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:cc:content-type; b=XzeQbHxYQYoS7jHlYpsMeMzmVPRMmyDFzWc+jZKRR4daBq1KW4G8oNBNG3cLUCqEff ACrK2CqtTXlEiviU19kXUFs3br9hlE0bhraxNHTQn95xPydL7qNi1ryJ6PGA2d1ojmkp 5qmvabdXhrlneoF0U2dE7y1zxV5/Wlx+6W9Rw= Received: by 10.90.74.18 with SMTP id w18mr7615995aga.142.1280287545327; Tue, 27 Jul 2010 20:25:45 -0700 (PDT) MIME-Version: 1.0 Received: by 10.91.55.25 with HTTP; Tue, 27 Jul 2010 20:25:25 -0700 (PDT) From: Fam Zheng Date: Wed, 28 Jul 2010 11:25:25 +0800 Message-ID: To: The development of GNU GRUB Content-Type: multipart/mixed; boundary=0016361e87fc597f9a048c6a2c3c X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Erik van der Kouwe Subject: [PATCH] MINIX file system version 3 support X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 03:25:49 -0000 --0016361e87fc597f9a048c6a2c3c Content-Type: multipart/alternative; boundary=0016361e87fc597f8e048c6a2c3a --0016361e87fc597f8e048c6a2c3a Content-Type: text/plain; charset=UTF-8 Hi, To support MINIX file system version 3, this patch adds a new module named 'minix3'. It reuses most of the code in minix.mod, and handles the latest MINIX file system version 3. The requested assignment information has also been sent to assign@gnu.org. -- Best Regards! Fam Zheng --0016361e87fc597f8e048c6a2c3a Content-Type: text/html; charset=UTF-8 Hi,

To support MINIX file system version 3, this patch adds a new module named 'minix3'. It reuses most of the code in minix.mod, and handles the latest MINIX file system version 3.

The requested assignment information has also been sent to assign@gnu.org.

--
Best Regards!
Fam Zheng
--0016361e87fc597f8e048c6a2c3a-- --0016361e87fc597f9a048c6a2c3c Content-Type: application/octet-stream; name="grub_minix_fs.patch" Content-Disposition: attachment; filename="grub_minix_fs.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gc5lxh0y0 PT09IG1vZGlmaWVkIGZpbGUgJ2NvbmYvY29tbW9uLnJtaycKLS0tIGNvbmYvY29tbW9uLnJtawky MDEwLTA3LTA2IDE4OjI3OjU1ICswMDAwCisrKyBjb25mL2NvbW1vbi5ybWsJMjAxMC0wNy0yOCAw MDo1OToyNyArMDAwMApAQCAtMzIsNyArMzIsNyBAQAogCWZzL2FmZnMuYyBmcy9jcGlvLmMgZnMv ZmF0LmMgZnMvZXh0Mi5jIGZzL2hmcy5jCQlcCiAJZnMvaGZzcGx1cy5jIGZzL2lzbzk2NjAuYyBm cy91ZGYuYyBmcy9qZnMuYyBmcy9taW5peC5jCVwKIAlmcy9uaWxmczIuYyBmcy9udGZzLmMgZnMv bnRmc2NvbXAuYyBmcy9yZWlzZXJmcy5jCVwKLQlmcy9zZnMuYyBmcy91ZnMuYyBmcy91ZnMyLmMg ZnMveGZzLmMgZnMvYWZzLmMJCVwKKwlmcy9zZnMuYyBmcy91ZnMuYyBmcy91ZnMyLmMgZnMveGZz LmMgZnMvYWZzLmMgZnMvbWluaXgzLmNcCiAJZnMvYWZzX2JlLmMgZnMvYmVmcy5jIGZzL2JlZnNf YmUuYyBmcy90YXIuYwkJXAogCVwKIAlwYXJ0bWFwL21zZG9zLmMgcGFydG1hcC9ic2RsYWJlbC5j IHBhcnRtYXAvYXBwbGUuYyBcCkBAIC01NSw3ICs1NSw3IEBACiAJbGliL2hleGR1bXAuYyBsaWIv Y3JjLmMgY29tbWFuZHMvYmxvY2tsaXN0LmMgY29tbWFuZHMvbHMuYyAJXAogCVwKIAlmcy9hZmZz LmMgZnMvY3Bpby5jIGZzL2ZhdC5jIGZzL2V4dDIuYyBmcy9oZnMuYwkJCVwKLQlmcy9oZnNwbHVz LmMgZnMvaXNvOTY2MC5jIGZzL3VkZi5jIGZzL2pmcy5jIGZzL21pbml4LmMJCVwKKwlmcy9oZnNw bHVzLmMgZnMvaXNvOTY2MC5jIGZzL3VkZi5jIGZzL2pmcy5jIGZzL21pbml4LmMgZnMvbWluaXgz LmNcCiAJZnMvbmlsZnMyLmMgZnMvbnRmcy5jIGZzL250ZnNjb21wLmMgZnMvcmVpc2VyZnMuYyBm cy9zZnMuYwlcCiAJZnMvdWZzLmMgZnMvdWZzMi5jIGZzL3hmcy5jIGZzL2Fmcy5jIGZzL2Fmc19i ZS5jIGZzL2JlZnMuYyAJXAogCWZzL2JlZnNfYmUuYyBmcy90YXIuYwkJCVwKQEAgLTIzNCw3ICsy MzQsNyBAQAogcGtnbGliX01PRFVMRVMgKz0gZnNoZWxwLm1vZCBmYXQubW9kIHVmczEubW9kIHVm czIubW9kIGV4dDIubW9kIG50ZnMubW9kIFwKIAludGZzY29tcC5tb2QgbWluaXgubW9kIGhmcy5t b2QgamZzLm1vZCBpc285NjYwLm1vZCB4ZnMubW9kCVwKIAlhZmZzLm1vZCBzZnMubW9kIGhmc3Bs dXMubW9kIHJlaXNlcmZzLm1vZCBjcGlvLm1vZCB0YXIubW9kCVwKLQl1ZGYubW9kCWFmcy5tb2Qg YWZzX2JlLm1vZCBiZWZzLm1vZCBiZWZzX2JlLm1vZAorCXVkZi5tb2QJYWZzLm1vZCBhZnNfYmUu bW9kIGJlZnMubW9kIGJlZnNfYmUubW9kIG1pbml4My5tb2QKIAogIyBGb3IgZnNoZWxwLm1vZC4K IGZzaGVscF9tb2RfU09VUkNFUyA9IGZzL2ZzaGVscC5jCkBAIC0yNzYsNiArMjc2LDExIEBACiBt aW5peF9tb2RfQ0ZMQUdTID0gJChDT01NT05fQ0ZMQUdTKQogbWluaXhfbW9kX0xERkxBR1MgPSAk KENPTU1PTl9MREZMQUdTKQogCisjIEZvciBtaW5peDMubW9kLgorbWluaXgzX21vZF9TT1VSQ0VT ID0gZnMvbWluaXgzLmMKK21pbml4M19tb2RfQ0ZMQUdTID0gJChDT01NT05fQ0ZMQUdTKQorbWlu aXgzX21vZF9MREZMQUdTID0gJChDT01NT05fTERGTEFHUykKKwogIyBGb3IgbmlsZnMyLm1vZC4K IHBrZ2xpYl9NT0RVTEVTICs9IG5pbGZzMi5tb2QKIG5pbGZzMl9tb2RfU09VUkNFUyA9IGZzL25p bGZzMi5jCgo9PT0gbW9kaWZpZWQgZmlsZSAnY29uZi9pMzg2LXBjLnJtaycKLS0tIGNvbmYvaTM4 Ni1wYy5ybWsJMjAxMC0wNy0wNiAxODoyNzo1NSArMDAwMAorKysgY29uZi9pMzg2LXBjLnJtawky MDEwLTA3LTI4IDAwOjU5OjI3ICswMDAwCkBAIC03MCw3ICs3MCw3IEBACiAJa2Vybi9lbXUvbW0u YyBrZXJuL2ZzLmMga2Vybi9lbnYuYyBrZXJuL2xpc3QuYyBmcy9mc2hlbHAuYwlcCiAJCQkJCQkJ CQlcCiAJZnMvYWZmcy5jIGZzL2NwaW8uYyBmcy9leHQyLmMgZnMvZmF0LmMgZnMvaGZzLmMJCQlc Ci0JZnMvaGZzcGx1cy5jIGZzL2lzbzk2NjAuYyBmcy91ZGYuYyBmcy9qZnMuYyBmcy9taW5peC5j CQlcCisJZnMvaGZzcGx1cy5jIGZzL2lzbzk2NjAuYyBmcy91ZGYuYyBmcy9qZnMuYyBmcy9taW5p eC5jIGZzL21pbml4My5jXAogCWZzL25pbGZzMi5jIGZzL250ZnMuYyBmcy9udGZzY29tcC5jIGZz L3JlaXNlcmZzLmMJCVwKIAlmcy9zZnMuYyBmcy91ZnMuYyBmcy91ZnMyLmMgZnMveGZzLmMgZnMv YWZzLmMJCQlcCiAJZnMvYWZzX2JlLmMgZnMvYmVmcy5jIGZzL2JlZnNfYmUuYyBmcy90YXIuYwkJ CVwKCj09PSBtb2RpZmllZCBmaWxlICdjb25mL3NwYXJjNjQtaWVlZTEyNzUucm1rJwotLS0gY29u Zi9zcGFyYzY0LWllZWUxMjc1LnJtawkyMDEwLTA3LTA2IDE4OjI3OjU1ICswMDAwCisrKyBjb25m L3NwYXJjNjQtaWVlZTEyNzUucm1rCTIwMTAtMDctMjggMDA6NTk6MjcgKzAwMDAKQEAgLTU0LDcg KzU0LDcgQEAKIAlmcy9mc2hlbHAuYwkJCQkJCQlcCiAJCQkJCQkJCQlcCiAJZnMvYWZmcy5jIGZz L2NwaW8uYyBmcy9leHQyLmMgZnMvZmF0LmMgZnMvaGZzLmMJCQlcCi0JZnMvaGZzcGx1cy5jIGZz L2lzbzk2NjAuYyBmcy91ZGYuYyBmcy9qZnMuYyBmcy9taW5peC5jCQlcCisJZnMvaGZzcGx1cy5j IGZzL2lzbzk2NjAuYyBmcy91ZGYuYyBmcy9qZnMuYyBmcy9taW5peC5jIGZzL21pbml4My5jXAog CWZzL25pbGZzMi5jIGZzL250ZnMuYyBmcy9udGZzY29tcC5jIGZzL3JlaXNlcmZzLmMJCVwKIAlm cy9zZnMuYyBmcy91ZnMuYyBmcy91ZnMyLmMgZnMveGZzLmMgZnMvYWZzLmMJCQlcCiAJZnMvYWZz X2JlLmMgZnMvYmVmcy5jIGZzL2JlZnNfYmUuYyBmcy90YXIuYwkJCVwKCj09PSBtb2RpZmllZCBm aWxlICdmcy9taW5peC5jJwotLS0gZnMvbWluaXguYwkyMDA5LTEyLTI1IDAwOjA0OjUxICswMDAw CisrKyBmcy9taW5peC5jCTIwMTAtMDctMjggMDE6Mzg6MDcgKzAwMDAKQEAgLTIwLDYgKzIwLDcg QEAKICNpbmNsdWRlIDxncnViL2Vyci5oPgogI2luY2x1ZGUgPGdydWIvZmlsZS5oPgogI2luY2x1 ZGUgPGdydWIvbW0uaD4KKyNpbmNsdWRlIDxncnViL3BhcnRpdGlvbi5oPgogI2luY2x1ZGUgPGdy dWIvbWlzYy5oPgogI2luY2x1ZGUgPGdydWIvZGlzay5oPgogI2luY2x1ZGUgPGdydWIvZGwuaD4K QEAgLTI3LDkgKzI4LDkgQEAKIAogI2RlZmluZSBHUlVCX01JTklYX01BR0lDCTB4MTM3RgogI2Rl ZmluZSBHUlVCX01JTklYMl9NQUdJQwkweDI0NjgKKyNkZWZpbmUgR1JVQl9NSU5JWDNfTUFHSUMJ MHg0RDVBCiAjZGVmaW5lIEdSVUJfTUlOSVhfTUFHSUNfMzAJMHgxMzhGCiAjZGVmaW5lIEdSVUJf TUlOSVgyX01BR0lDXzMwCTB4MjQ3OAotI2RlZmluZSBHUlVCX01JTklYX0JTSVpFCTEwMjRVCiAj ZGVmaW5lIEdSVUJfTUlOSVhfTE9HMl9CU0laRQkxCiAjZGVmaW5lIEdSVUJfTUlOSVhfUk9PVF9J Tk9ERQkxCiAjZGVmaW5lIEdSVUJfTUlOSVhfTUFYX1NZTUxOS19DTlQJOApAQCAtMzgsMTEgKzM5 LDIyIEBACiAjZGVmaW5lIEdSVUJfTUlOSVhfSUZESVIJMDA0MDAwMFUKICNkZWZpbmUgR1JVQl9N SU5JWF9JRkxOSwkwMTIwMDAwVQogCisjaWZkZWYgR1JVQl9NT0RfTUlOSVgzCisjZGVmaW5lIEdS VUJfTUlOSVhfSU5PREUoZGF0YSxmaWVsZCkgKGRhdGEtPmlub2RlMy5maWVsZCkKKyNlbHNlCiAj ZGVmaW5lIEdSVUJfTUlOSVhfSU5PREUoZGF0YSxmaWVsZCkgKGRhdGEtPnZlcnNpb24gPT0gMSA/ IFwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGEtPmlub2RlLiAgZmllbGQgOiBkYXRh LT5pbm9kZTIuICBmaWVsZCkKKyNlbmRpZgorCisjaWZkZWYgR1JVQl9NT0RfTUlOSVgzCisjZGVm aW5lIEdSVUJfTUlOSVhfSU5PREVfRU5ESUFOKGRhdGEsZmllbGQsYml0czEsYml0czIpIFwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgIChncnViX2xlX3RvX2NwdSMjYml0czIgKGRhdGEtPmlu b2RlMy5maWVsZCkpCisjZWxzZQogI2RlZmluZSBHUlVCX01JTklYX0lOT0RFX0VORElBTihkYXRh LGZpZWxkLGJpdHMxLGJpdHMyKSAoZGF0YS0+dmVyc2lvbiA9PSAxID8JXAogICAgICAgICAgICAg ICAgICAgICAgICAgZ3J1Yl9sZV90b19jcHUjI2JpdHMxIChkYXRhLT5pbm9kZS5maWVsZCkgOgkJ XAogICAgICAgICAgICAgICAgICAgICAgICAgZ3J1Yl9sZV90b19jcHUjI2JpdHMyIChkYXRhLT5p bm9kZTIuZmllbGQpKQorI2VuZGlmCisKICNkZWZpbmUgR1JVQl9NSU5JWF9JTk9ERV9TSVpFKGRh dGEpIEdSVUJfTUlOSVhfSU5PREVfRU5ESUFOIChkYXRhLHNpemUsMTYsMzIpCiAjZGVmaW5lIEdS VUJfTUlOSVhfSU5PREVfTU9ERShkYXRhKSBHUlVCX01JTklYX0lOT0RFX0VORElBTiAoZGF0YSxt b2RlLDE2LDE2KQogI2RlZmluZSBHUlVCX01JTklYX0lOT0RFX0RJUl9aT05FUyhkYXRhLGJsaykg R1JVQl9NSU5JWF9JTk9ERV9FTkRJQU4JCVwKQEAgLTU0LDE5ICs2Niw0MSBAQAogI2RlZmluZSBH UlVCX01JTklYX0lOT0RFX0JMS1NaKGRhdGEpIChkYXRhLT52ZXJzaW9uID09IDEgPyAyIDogNCkK ICNkZWZpbmUgR1JVQl9NSU5JWF9MT0cyX1pPTkVTWgkoR1JVQl9NSU5JWF9MT0cyX0JTSVpFCQkJ CVwKIAkJCQkgKyBncnViX2xlX3RvX2NwdTE2IChzYmxvY2stPmxvZzJfem9uZV9zaXplKSkKLSNk ZWZpbmUgR1JVQl9NSU5JWF9aT05FU1oJKEdSVUJfTUlOSVhfQlNJWkUgCQkJCVwKKyNkZWZpbmUg R1JVQl9NSU5JWF9aT05FU1oJKGJsb2Nrc2l6ZSAJCQkJXAogCQkJCSA8PCBncnViX2xlX3RvX2Nw dTE2IChzYmxvY2stPmxvZzJfem9uZV9zaXplKSkKIAogc3RydWN0IGdydWJfbWluaXhfc2Jsb2Nr CiB7CisjaWZkZWYgR1JVQl9NT0RfTUlOSVgzCisgIGdydWJfdWludDMyX3QgaW5vZGVfY250Owor I2Vsc2UKICAgZ3J1Yl91aW50MTZfdCBpbm9kZV9jbnQ7CisjZW5kaWYKKwogICBncnViX3VpbnQx Nl90IHpvbmVfY250OwogICBncnViX3VpbnQxNl90IGlub2RlX2JtYXBfc2l6ZTsKICAgZ3J1Yl91 aW50MTZfdCB6b25lX2JtYXBfc2l6ZTsKICAgZ3J1Yl91aW50MTZfdCBmaXJzdF9kYXRhX3pvbmU7 CiAgIGdydWJfdWludDE2X3QgbG9nMl96b25lX3NpemU7CisgIAorI2lmZGVmIEdSVUJfTU9EX01J TklYMworICBncnViX3VpbnQxNl90IHBhZDsKKyNlbmRpZgorCiAgIGdydWJfdWludDMyX3QgbWF4 X2ZpbGVfc2l6ZTsKKworI2lmZGVmIEdSVUJfTU9EX01JTklYMworICBncnViX3VpbnQzMl90IHpv bmVzOworI2VuZGlmCisKICAgZ3J1Yl91aW50MTZfdCBtYWdpYzsKKworI2lmZGVmIEdSVUJfTU9E X01JTklYMworICAvKiBWMyBvbmx5IGZpZWxkcyAqLworICBncnViX3VpbnQxNl90IHBhZDI7Cisg IGdydWJfdWludDE2X3QgYmxvY2tfc2l6ZTsKKyAgZ3J1Yl91aW50OF90IGRpc2tfdmVyc2lvbjsg CisjZW5kaWYKIH07CiAKIHN0cnVjdCBncnViX21pbml4X2lub2RlCkBAIC05OSwxMiArMTMzLDM2 IEBACiAKIH07CiAKKyNpZmRlZiBHUlVCX01PRF9NSU5JWDMKK3N0cnVjdCBncnViX21pbml4M19p bm9kZQoreworICBncnViX3VpbnQxNl90IG1vZGU7CisgIGdydWJfdWludDE2X3QgbmxpbmtzOwor ICBncnViX3VpbnQxNl90IHVpZDsKKyAgZ3J1Yl91aW50OF90IGdpZDsKKyAgZ3J1Yl91aW50OF90 IHBhZF87CisgIGdydWJfdWludDMyX3Qgc2l6ZTsKKyAgZ3J1Yl91aW50MzJfdCBhdGltZTsKKyAg Z3J1Yl91aW50MzJfdCBtdGltZTsKKyAgZ3J1Yl91aW50MzJfdCBjdGltZTsKKyAgZ3J1Yl91aW50 MzJfdCBkaXJfem9uZXNbN107CisgIGdydWJfdWludDMyX3QgaW5kaXJfem9uZTsKKyAgZ3J1Yl91 aW50MzJfdCBkb3VibGVfaW5kaXJfem9uZTsKKyAgZ3J1Yl91aW50MzJfdCB1bnVzZWQ7CisKK307 CisjZW5kaWYKKworCiAvKiBJbmZvcm1hdGlvbiBhYm91dCBhICJtb3VudGVkIiBtaW5peCBmaWxl c3lzdGVtLiAgKi8KIHN0cnVjdCBncnViX21pbml4X2RhdGEKIHsKICAgc3RydWN0IGdydWJfbWlu aXhfc2Jsb2NrIHNibG9jazsKICAgc3RydWN0IGdydWJfbWluaXhfaW5vZGUgaW5vZGU7CiAgIHN0 cnVjdCBncnViX21pbml4Ml9pbm9kZSBpbm9kZTI7CisjaWZkZWYgR1JVQl9NT0RfTUlOSVgzCisg IHN0cnVjdCBncnViX21pbml4M19pbm9kZSBpbm9kZTM7CisjZW5kaWYKICAgaW50IGlubzsKICAg aW50IGxpbmtuZXN0OwogICBncnViX2Rpc2tfdCBkaXNrOwpAQCAtMTEzLDIxICsxNzEsMzggQEAK IH07CiAKIHN0YXRpYyBncnViX2RsX3QgbXlfbW9kOwotDAorc3RhdGljIHVuc2lnbmVkIGludCBi bG9ja3NpemU7CisKKwogc3RhdGljIGdydWJfZXJyX3QgZ3J1Yl9taW5peF9maW5kX2ZpbGUgKHN0 cnVjdCBncnViX21pbml4X2RhdGEgKmRhdGEsCiAJCQkJCWNvbnN0IGNoYXIgKnBhdGgpOwogCiBz dGF0aWMgaW50CiBncnViX21pbml4X2dldF9maWxlX2Jsb2NrIChzdHJ1Y3QgZ3J1Yl9taW5peF9k YXRhICpkYXRhLCB1bnNpZ25lZCBpbnQgYmxrKQogeworI2lmbmRlZiBHUlVCX01PRF9NSU5JWDMK ICAgc3RydWN0IGdydWJfbWluaXhfc2Jsb2NrICpzYmxvY2sgPSAmZGF0YS0+c2Jsb2NrOworI2Vu ZGlmCiAgIGludCBpbmRpcjsKLQogICBhdXRvIGludCBncnViX2dldF9pbmRpciAoaW50LCBpbnQp OwogCisjaWZkZWYgR1JVQl9NT0RfTUlOSVgzCisgIHVuc2lnbmVkIGludCBmaXJzdF9kYmxfaW5k aXI7CisgIHVuc2lnbmVkIGludCBpbmRpcl9jYXBhY2l0eTsKKyAgaW5kaXJfY2FwYWNpdHk9Ymxv Y2tzaXplLzQ7CisjZW5kaWYKKwogICAvKiBSZWFkIHRoZSBibG9jayBwb2ludGVyIGluIFpPTkUs IG9uIHRoZSBvZmZzZXQgTlVNLiAgKi8KICAgaW50IGdydWJfZ2V0X2luZGlyIChpbnQgem9uZSwg aW50IG51bSkKICAgICB7CisjaWZkZWYgR1JVQl9NT0RfTUlOSVgzCisgICAgICBncnViX3VpbnQz Ml90IGluZGlyMzI7CisJZ3J1Yl9kaXNrX3JlYWQgKGRhdGEtPmRpc2ssCisJCQl6b25lICogKGJs b2Nrc2l6ZSAvIEdSVUJfRElTS19TRUNUT1JfU0laRSksCisJCQlzaXplb2YgKGdydWJfdWludDMy X3QpICogbnVtLAorCQkJc2l6ZW9mIChncnViX3VpbnQzMl90KSwgKGNoYXIgKikgJmluZGlyMzIp OworCXJldHVybiBncnViX2xlX3RvX2NwdTMyIChpbmRpcjMyKTsKKyNlbHNlCiAgICAgICBpZiAo ZGF0YS0+dmVyc2lvbiA9PSAxKQogCXsKIAkgIGdydWJfdWludDE2X3QgaW5kaXIxNjsKQEAgLTE0 Niw2ICsyMjEsNyBAQAogCQkJICBzaXplb2YgKGdydWJfdWludDMyX3QpLCAoY2hhciAqKSAmaW5k aXIzMik7CiAJICByZXR1cm4gZ3J1Yl9sZV90b19jcHUzMiAoaW5kaXIzMik7CiAJfQorI2VuZGlm CiAgICAgfQogCiAgIC8qIERpcmVjdCBibG9jay4gICovCkBAIC0xNTMsMjUgKzIyOSw0NiBAQAog ICAgIHJldHVybiBHUlVCX01JTklYX0lOT0RFX0RJUl9aT05FUyAoZGF0YSwgYmxrKTsKIAogICAv KiBJbmRpcmVjdCBibG9jay4gICovCisjaWZkZWYgR1JVQl9NT0RfTUlOSVgzCisgIGZpcnN0X2Ri bF9pbmRpcj1pbmRpcl9jYXBhY2l0eSs3OworICBpZiAoYmxrIDwgZmlyc3RfZGJsX2luZGlyKQor ICAgIHsKKyAgICAgIGJsayAtPSA3OworICAgICAgaW5kaXIgPSBncnViX2dldF9pbmRpciAoR1JV Ql9NSU5JWF9JTk9ERV9JTkRJUl9aT05FIChkYXRhKSwgYmxrKTsKKyAgICAgIHJldHVybiBpbmRp cjsKKyAgICB9CisjZWxzZQogICBibGsgLT0gNzsKICAgaWYgKGJsayA8IEdSVUJfTUlOSVhfWk9O RVNaIC8gR1JVQl9NSU5JWF9JTk9ERV9CTEtTWiAoZGF0YSkpCiAgICAgewogICAgICAgaW5kaXIg PSBncnViX2dldF9pbmRpciAoR1JVQl9NSU5JWF9JTk9ERV9JTkRJUl9aT05FIChkYXRhKSwgYmxr KTsKICAgICAgIHJldHVybiBpbmRpcjsKICAgICB9CisjZW5kaWYKIAogICAvKiBEb3VibGUgaW5k aXJlY3QgYmxvY2suICAqLworI2lmZGVmIEdSVUJfTU9EX01JTklYMworICBibGsgLT0gZmlyc3Rf ZGJsX2luZGlyOworICBpZiAoYmxrIDwgaW5kaXJfY2FwYWNpdHkgKiBpbmRpcl9jYXBhY2l0eSkK KyAgICB7CisJCQorICAgICAgaW5kaXIgPSBncnViX2dldF9pbmRpciAoR1JVQl9NSU5JWF9JTk9E RV9ESU5ESVJfWk9ORSAoZGF0YSksCisJCQkgICAgICBibGsgLyBpbmRpcl9jYXBhY2l0eSk7Cisg ICAgICBpbmRpciA9IGdydWJfZ2V0X2luZGlyIChpbmRpciwgYmxrICUgaW5kaXJfY2FwYWNpdHkp OworCisgICAgICByZXR1cm4gaW5kaXI7CisgICAgfQorI2Vsc2UKICAgYmxrIC09IEdSVUJfTUlO SVhfWk9ORVNaIC8gR1JVQl9NSU5JWF9JTk9ERV9CTEtTWiAoZGF0YSk7CiAgIGlmIChibGsgPCAo R1JVQl9NSU5JWF9aT05FU1ogLyBHUlVCX01JTklYX0lOT0RFX0JMS1NaIChkYXRhKSkKICAgICAg ICogKEdSVUJfTUlOSVhfWk9ORVNaIC8gR1JVQl9NSU5JWF9JTk9ERV9CTEtTWiAoZGF0YSkpKQog ICAgIHsKICAgICAgIGluZGlyID0gZ3J1Yl9nZXRfaW5kaXIgKEdSVUJfTUlOSVhfSU5PREVfRElO RElSX1pPTkUgKGRhdGEpLAogCQkJICAgICAgYmxrIC8gR1JVQl9NSU5JWF9aT05FU1opOwotCiAg ICAgICBpbmRpciA9IGdydWJfZ2V0X2luZGlyIChpbmRpciwgYmxrICUgR1JVQl9NSU5JWF9aT05F U1opOwotCiAgICAgICByZXR1cm4gaW5kaXI7CiAgICAgfQorI2VuZGlmCiAKICAgLyogVGhpcyBz aG91bGQgbmV2ZXIgaGFwcGVuLiAgKi8KICAgZ3J1Yl9lcnJvciAoR1JVQl9FUlJfT1VUX09GX1JB TkdFLCAiZmlsZSBiaWdnZXIgdGhhbiBtYXhpbXVtIHNpemUiKTsKQEAgLTE4OCwyMiArMjg1LDI0 IEBACiAJCQkJCSB1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCksCiAJCSAgICAgIGlu dCBwb3MsIGdydWJfZGlza19hZGRyX3QgbGVuLCBjaGFyICpidWYpCiB7CisjaWZuZGVmIEdSVUJf TU9EX01JTklYMwogICBzdHJ1Y3QgZ3J1Yl9taW5peF9zYmxvY2sgKnNibG9jayA9ICZkYXRhLT5z YmxvY2s7CisjZW5kaWYKICAgaW50IGk7CiAgIGludCBibG9ja2NudDsKIAogICAvKiBBZGp1c3Qg bGVuIHNvIGl0IHdlIGNhbid0IHJlYWQgcGFzdCB0aGUgZW5kIG9mIHRoZSBmaWxlLiAgKi8KICAg aWYgKGxlbiArIHBvcyA+IEdSVUJfTUlOSVhfSU5PREVfU0laRSAoZGF0YSkpCiAgICAgbGVuID0g R1JVQl9NSU5JWF9JTk9ERV9TSVpFIChkYXRhKSAtIHBvczsKLQotICBibG9ja2NudCA9IChsZW4g KyBwb3MgKyBHUlVCX01JTklYX0JTSVpFIC0gMSkgLyBHUlVCX01JTklYX0JTSVpFOwotCi0gIGZv ciAoaSA9IHBvcyAvIEdSVUJfTUlOSVhfQlNJWkU7IGkgPCBibG9ja2NudDsgaSsrKQorICAgIAor ICBibG9ja2NudCA9IChsZW4gKyBwb3MgKyBibG9ja3NpemUgLSAxKTsKKyAgYmxvY2tjbnQgLz0g YmxvY2tzaXplOworCisgIGZvciAoaSA9IHBvcyAvIGJsb2Nrc2l6ZTsgaSA8IGJsb2NrY250OyBp KyspCiAgICAgewogICAgICAgaW50IGJsa25yOwotICAgICAgaW50IGJsb2Nrb2ZmID0gcG9zICUg R1JVQl9NSU5JWF9CU0laRTsKLSAgICAgIGludCBibG9ja2VuZCA9IEdSVUJfTUlOSVhfQlNJWkU7 Ci0KKyAgICAgIGludCBibG9ja29mZiA9IHBvcyAlIGJsb2Nrc2l6ZTsKKyAgICAgIGludCBibG9j a2VuZCA9IGJsb2Nrc2l6ZTsKICAgICAgIGludCBza2lwZmlyc3QgPSAwOwogCiAgICAgICBibGtu ciA9IGdydWJfbWluaXhfZ2V0X2ZpbGVfYmxvY2sgKGRhdGEsIGkpOwpAQCAtMjEzLDI4ICszMTIs MzMgQEAKICAgICAgIC8qIExhc3QgYmxvY2suICAqLwogICAgICAgaWYgKGkgPT0gYmxvY2tjbnQg LSAxKQogCXsKLQkgIGJsb2NrZW5kID0gKGxlbiArIHBvcykgJSBHUlVCX01JTklYX0JTSVpFOwot CisJICBibG9ja2VuZCA9IChsZW4gKyBwb3MpOworCSAgYmxvY2tlbmQgJT0gYmxvY2tzaXplOwog CSAgaWYgKCFibG9ja2VuZCkKLQkgICAgYmxvY2tlbmQgPSBHUlVCX01JTklYX0JTSVpFOworCSAg ICBibG9ja2VuZCA9IGJsb2Nrc2l6ZTsKIAl9CiAKICAgICAgIC8qIEZpcnN0IGJsb2NrLiAgKi8K LSAgICAgIGlmIChpID09IChwb3MgLyAoaW50KSBHUlVCX01JTklYX0JTSVpFKSkKKyAgICAgIGlm IChpID09IChwb3MgLyAoaW50KSBibG9ja3NpemUpKQogCXsKIAkgIHNraXBmaXJzdCA9IGJsb2Nr b2ZmOwogCSAgYmxvY2tlbmQgLT0gc2tpcGZpcnN0OwogCX0KIAogICAgICAgZGF0YS0+ZGlzay0+ cmVhZF9ob29rID0gcmVhZF9ob29rOworI2lmZGVmIEdSVUJfTU9EX01JTklYMworICAgICAgZ3J1 Yl9kaXNrX3JlYWQgKGRhdGEtPmRpc2ssIAorCQkgICAgICBibGtuciAqIChkYXRhLT5zYmxvY2su YmxvY2tfc2l6ZS9HUlVCX0RJU0tfU0VDVE9SX1NJWkUpLAorCQkgICAgICBza2lwZmlyc3QsIGJs b2NrZW5kLCBidWYpOworI2Vsc2UKICAgICAgIGdydWJfZGlza19yZWFkIChkYXRhLT5kaXNrLCBi bGtuciA8PCBHUlVCX01JTklYX0xPRzJfWk9ORVNaLAogCQkgICAgICBza2lwZmlyc3QsIGJsb2Nr ZW5kLCBidWYpOwotCisjZW5kaWYKICAgICAgIGRhdGEtPmRpc2stPnJlYWRfaG9vayA9IDA7CiAg ICAgICBpZiAoZ3J1Yl9lcnJubykKIAlyZXR1cm4gLTE7CiAKLSAgICAgIGJ1ZiArPSBHUlVCX01J TklYX0JTSVpFIC0gc2tpcGZpcnN0OworICAgICAgYnVmICs9IGJsb2Nrc2l6ZSAtIHNraXBmaXJz dDsKICAgICB9CiAKICAgcmV0dXJuIGxlbjsKQEAgLTI1MCw2ICszNTQsNyBAQAogCiAgIC8qIEJs b2NrIGluIHdoaWNoIHRoZSBpbm9kZSBpcyBzdG9yZWQuICAqLwogICBpbnQgYmxvY2s7CisgIGlm KGlubz09MCkgcmV0dXJuIEdSVUJfRVJSX0JBRF9BUkdVTUVOVDsKICAgZGF0YS0+aW5vID0gaW5v OwogCiAgIC8qIFRoZSBmaXJzdCBpbm9kZSBpbiBtaW5peCBpcyBpbm9kZSAxLiAgKi8KQEAgLTI1 OSw2ICszNjQsMTkgQEAKIAkgICAgKyBncnViX2xlX3RvX2NwdTE2IChzYmxvY2stPnpvbmVfYm1h cF9zaXplKSkKIAkgICA8PCBHUlVCX01JTklYX0xPRzJfQlNJWkUpOwogCisjaWZkZWYgR1JVQl9N T0RfTUlOSVgzCisgIGJsb2NrID0gKCgyICsgZ3J1Yl9sZV90b19jcHUxNiAoc2Jsb2NrLT5pbm9k ZV9ibWFwX3NpemUpCisJICArIGdydWJfbGVfdG9fY3B1MTYgKHNibG9jay0+em9uZV9ibWFwX3Np emUpKQorCSAgKiAoc2Jsb2NrLT5ibG9ja19zaXplIC8gR1JVQl9ESVNLX1NFQ1RPUl9TSVpFKSk7 CisJICBibG9jayArPSBpbm8gLyAoR1JVQl9ESVNLX1NFQ1RPUl9TSVpFCisJCSAgICAgIC8gc2l6 ZW9mIChzdHJ1Y3QgZ3J1Yl9taW5peDNfaW5vZGUpKTsKKyAgaW50IG9mZnMgPSAoaW5vCisJICAl IChHUlVCX0RJU0tfU0VDVE9SX1NJWkUgLyBzaXplb2YgKHN0cnVjdCBncnViX21pbml4M19pbm9k ZSkpCisJICAqIHNpemVvZiAoc3RydWN0IGdydWJfbWluaXgzX2lub2RlKSk7CisJCisgIGdydWJf ZGlza19yZWFkIChkYXRhLT5kaXNrLCBibG9jaywgb2ZmcywKKwkJICAgICAgc2l6ZW9mIChzdHJ1 Y3QgZ3J1Yl9taW5peDNfaW5vZGUpLCZkYXRhLT5pbm9kZTMpOworI2Vsc2UKICAgaWYgKGRhdGEt PnZlcnNpb24gPT0gMSkKICAgICB7CiAgICAgICBibG9jayArPSBpbm8gLyAoR1JVQl9ESVNLX1NF Q1RPUl9TSVpFIC8gc2l6ZW9mIChzdHJ1Y3QgZ3J1Yl9taW5peF9pbm9kZSkpOwpAQCAtMjgwLDcg KzM5OCw3IEBACiAgICAgICBncnViX2Rpc2tfcmVhZCAoZGF0YS0+ZGlzaywgYmxvY2ssIG9mZnMs CiAJCSAgICAgIHNpemVvZiAoc3RydWN0IGdydWJfbWluaXgyX2lub2RlKSwmZGF0YS0+aW5vZGUy KTsKICAgICB9Ci0KKyNlbmRpZgogICByZXR1cm4gR1JVQl9FUlJfTk9ORTsKIH0KIApAQCAtMzQ4 LDE2ICs0NjYsMjAgQEAKIAogICBkbwogICAgIHsKKyNpZmRlZiBHUlVCX01PRF9NSU5JWDMKKyAg ICAgIGdydWJfdWludDMyX3QgaW5vOworI2Vsc2UKICAgICAgIGdydWJfdWludDE2X3QgaW5vOwor I2VuZGlmCiAgICAgICBjaGFyIGZpbGVuYW1lW2RhdGEtPmZpbGVuYW1lX3NpemUgKyAxXTsKIAog ICAgICAgaWYgKGdydWJfc3RybGVuIChuYW1lKSA9PSAwKQogCXJldHVybiBHUlVCX0VSUl9OT05F OwogCi0gICAgICBpZiAoZ3J1Yl9taW5peF9yZWFkX2ZpbGUgKGRhdGEsIDAsIHBvcywgc2l6ZW9m IChpbm8pLAorICAgICAgaWYgKGdydWJfbWluaXhfcmVhZF9maWxlIChkYXRhLCAwLCBwb3MsIHNp emVvZihpbm8pLAogCQkJCShjaGFyICopICZpbm8pIDwgMCkKIAlyZXR1cm4gZ3J1Yl9lcnJubzsK LSAgICAgIGlmIChncnViX21pbml4X3JlYWRfZmlsZSAoZGF0YSwgMCwgcG9zICsgc2l6ZW9mIChp bm8pLAorICAgICAgaWYgKGdydWJfbWluaXhfcmVhZF9maWxlIChkYXRhLCAwLCBwb3MgKyBzaXpl b2YoaW5vKSwKIAkJCQlkYXRhLT5maWxlbmFtZV9zaXplLCAoY2hhciAqKSBmaWxlbmFtZSk8IDAp CiAJcmV0dXJuIGdydWJfZXJybm87CiAKQEAgLTQyMiw3ICs1NDQsMTUgQEAKIAkJICBzaXplb2Yg KHN0cnVjdCBncnViX21pbml4X3NibG9jayksJmRhdGEtPnNibG9jayk7CiAgIGlmIChncnViX2Vy cm5vKQogICAgIGdvdG8gZmFpbDsKLQorI2lmZGVmIEdSVUJfTU9EX01JTklYMworICBpZiAoZ3J1 Yl9sZV90b19jcHUxNiAoZGF0YS0+c2Jsb2NrLm1hZ2ljKSA9PSBHUlVCX01JTklYM19NQUdJQykK KyAgICB7CisgICAgICBkYXRhLT52ZXJzaW9uID0gMzsKKyAgICAgIGRhdGEtPmZpbGVuYW1lX3Np emUgPSA2MDsKKyAgICB9CisgIGVsc2UKKyAgICBnb3RvIGZhaWw7CisjZWxzZQogICBpZiAoZ3J1 Yl9sZV90b19jcHUxNiAoZGF0YS0+c2Jsb2NrLm1hZ2ljKSA9PSBHUlVCX01JTklYX01BR0lDKQog ICAgIHsKICAgICAgIGRhdGEtPnZlcnNpb24gPSAxOwpAQCAtNDQ1LDEwICs1NzUsMTUgQEAKICAg ICB9CiAgIGVsc2UKICAgICBnb3RvIGZhaWw7Ci0KKyNlbmRpZgogICBkYXRhLT5kaXNrID0gZGlz azsKICAgZGF0YS0+bGlua25lc3QgPSAwOwogCisjaWZkZWYgR1JVQl9NT0RfTUlOSVgzCisgIGJs b2Nrc2l6ZSA9IGRhdGEtPnNibG9jay5ibG9ja19zaXplOworI2Vsc2UKKyAgYmxvY2tzaXplID0g MTAyNDsKKyNlbmRpZgogICByZXR1cm4gZGF0YTsKIAogIGZhaWw6CkBAIC00NTYsNyArNTkxLDcg QEAKICAgZ3J1Yl9lcnJvciAoR1JVQl9FUlJfQkFEX0ZTLCAibm90IGEgbWluaXggZmlsZXN5c3Rl bSIpOwogICByZXR1cm4gMDsKIH0KLQwKKwogc3RhdGljIGdydWJfZXJyX3QKIGdydWJfbWluaXhf ZGlyIChncnViX2RldmljZV90IGRldmljZSwgY29uc3QgY2hhciAqcGF0aCwKIAkJICBpbnQgKCpo b29rKSAoY29uc3QgY2hhciAqZmlsZW5hbWUsCkBAIC00ODgsNyArNjIzLDExIEBACiAKICAgd2hp bGUgKHBvcyA8IEdSVUJfTUlOSVhfSU5PREVfU0laRSAoZGF0YSkpCiAgICAgeworI2lmZGVmIEdS VUJfTU9EX01JTklYMworICAgICAgZ3J1Yl91aW50MzJfdCBpbm87CisjZWxzZQogICAgICAgZ3J1 Yl91aW50MTZfdCBpbm87CisjZW5kaWYKICAgICAgIGNoYXIgZmlsZW5hbWVbZGF0YS0+ZmlsZW5h bWVfc2l6ZSArIDFdOwogICAgICAgaW50IGRpcmlubyA9IGRhdGEtPmlubzsKICAgICAgIHN0cnVj dCBncnViX2Rpcmhvb2tfaW5mbyBpbmZvOwpAQCAtNTA1LDE3ICs2NDQsMjAgQEAKIAlyZXR1cm4g Z3J1Yl9lcnJubzsKICAgICAgIGZpbGVuYW1lW2RhdGEtPmZpbGVuYW1lX3NpemVdID0gJ1wwJzsK IAotICAgICAgLyogVGhlIGZpbGV0eXBlIGlzIG5vdCBzdG9yZWQgaW4gdGhlIGRpcmVudC4gIFJl YWQgdGhlIGlub2RlIHRvCi0JIGZpbmQgb3V0IHRoZSBmaWxldHlwZS4gIFRoaXMgKlJFQUxMWSog c3Vja3MuICAqLwotICAgICAgZ3J1Yl9taW5peF9yZWFkX2lub2RlIChkYXRhLCBncnViX2xlX3Rv X2NwdTE2IChpbm8pKTsKLSAgICAgIGluZm8uZGlyID0gKChHUlVCX01JTklYX0lOT0RFX01PREUg KGRhdGEpCi0JCSAgICYgR1JVQl9NSU5JWF9JRkRJUikgPT0gR1JVQl9NSU5JWF9JRkRJUik7Ci0g ICAgICBpZiAoaG9vayAoZmlsZW5hbWUsICZpbmZvKSA/IDEgOiAwKQotCWJyZWFrOworICAgICAg aWYoaW5vKQorCXsKKwkgIC8qIEl0J3MgYSB2YWxpZCBkaXJlbnQgb25seSB3aGVuIGlubyA+IDAK KwkgICAgVGhlIGZpbGV0eXBlIGlzIG5vdCBzdG9yZWQgaW4gdGhlIGRpcmVudC4gIFJlYWQgdGhl IGlub2RlIHRvCisJICAgIGZpbmQgb3V0IHRoZSBmaWxldHlwZS4gIFRoaXMgKlJFQUxMWSogc3Vj a3MuICAqLworCSAgZ3J1Yl9taW5peF9yZWFkX2lub2RlIChkYXRhLCBncnViX2xlX3RvX2NwdTE2 IChpbm8pKTsKKwkgIGluZm8uZGlyID0gKChHUlVCX01JTklYX0lOT0RFX01PREUgKGRhdGEpCisJ CSAgICAgICYgR1JVQl9NSU5JWF9JRkRJUikgPT0gR1JVQl9NSU5JWF9JRkRJUik7CisJICBpZiAo aG9vayAoZmlsZW5hbWUsICZpbmZvKSA/IDEgOiAwKQorCSAgICBicmVhazsKIAogICAgICAgLyog TG9hZCB0aGUgb2xkIGlub2RlIGJhY2sgaW4uICAqLwogICAgICAgZ3J1Yl9taW5peF9yZWFkX2lu b2RlIChkYXRhLCBkaXJpbm8pOwotCisJfQogICAgICAgcG9zICs9IHNpemVvZiAoaW5vKSArIGRh dGEtPmZpbGVuYW1lX3NpemU7CiAgICAgfQogCkBAIC01ODIsMzMgKzcyNCwzNyBAQAogICByZXR1 cm4gR1JVQl9FUlJfTk9ORTsKIH0KIAotCi1zdGF0aWMgZ3J1Yl9lcnJfdAotZ3J1Yl9taW5peF9s YWJlbCAoZ3J1Yl9kZXZpY2VfdCBkZXZpY2UgX19hdHRyaWJ1dGUgKCh1bnVzZWQpKSwKLQkJY2hh ciAqKmxhYmVsIF9fYXR0cmlidXRlICgodW51c2VkKSkpCi17Ci0gIHJldHVybiBHUlVCX0VSUl9O T05FOwotfQotCiAMCiBzdGF0aWMgc3RydWN0IGdydWJfZnMgZ3J1Yl9taW5peF9mcyA9CiAgIHsK KyNpZmRlZiBHUlVCX01PRF9NSU5JWDMKKyAgICAubmFtZSA9ICJtaW5peDMiLAorI2Vsc2UKICAg ICAubmFtZSA9ICJtaW5peCIsCisjZW5kaWYKICAgICAuZGlyID0gZ3J1Yl9taW5peF9kaXIsCiAg ICAgLm9wZW4gPSBncnViX21pbml4X29wZW4sCiAgICAgLnJlYWQgPSBncnViX21pbml4X3JlYWQs CiAgICAgLmNsb3NlID0gZ3J1Yl9taW5peF9jbG9zZSwKLSAgICAubGFiZWwgPSBncnViX21pbml4 X2xhYmVsLAorICAgIC5sYWJlbCA9IDAsCiAgICAgLm5leHQgPSAwCiAgIH07CiAKKyNpZmRlZiBH UlVCX01PRF9NSU5JWDMKK0dSVUJfTU9EX0lOSVQobWluaXgzKQorI2Vsc2UKIEdSVUJfTU9EX0lO SVQobWluaXgpCisjZW5kaWYKIHsKICAgZ3J1Yl9mc19yZWdpc3RlciAoJmdydWJfbWluaXhfZnMp OwogICBteV9tb2QgPSBtb2Q7CiB9CiAKKyNpZmRlZiBHUlVCX01PRF9NSU5JWDMKK0dSVUJfTU9E X0ZJTkkobWluaXgzKQorI2Vsc2UKIEdSVUJfTU9EX0ZJTkkobWluaXgpCisjZW5kaWYKIHsKICAg Z3J1Yl9mc191bnJlZ2lzdGVyICgmZ3J1Yl9taW5peF9mcyk7CiB9Cgo9PT0gYWRkZWQgZmlsZSAn ZnMvbWluaXgzLmMnCi0tLSBmcy9taW5peDMuYwkxOTcwLTAxLTAxIDAwOjAwOjAwICswMDAwCisr KyBmcy9taW5peDMuYwkyMDEwLTA3LTI4IDAwOjU5OjI3ICswMDAwCkBAIC0wLDAgKzEsMiBAQAor I2RlZmluZSBHUlVCX01PRF9NSU5JWDMKKyNpbmNsdWRlICJtaW5peC5jIgo= --0016361e87fc597f9a048c6a2c3c-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1OtMXn-0000XZ-Hw for mharc-grub-devel@gnu.org; Wed, 08 Sep 2010 11:26:39 -0400 Received: from [140.186.70.92] (port=51250 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OtMXg-0000Vd-A7 for grub-devel@gnu.org; Wed, 08 Sep 2010 11:26:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OtMXc-0001uK-0C for grub-devel@gnu.org; Wed, 08 Sep 2010 11:26:32 -0400 Received: from mail-fx0-f41.google.com ([209.85.161.41]:57741) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OtMXb-0001uC-Rm for grub-devel@gnu.org; Wed, 08 Sep 2010 11:26:27 -0400 Received: by fxm3 with SMTP id 3so176655fxm.0 for ; Wed, 08 Sep 2010 08:26:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:references:in-reply-to :x-enigmail-version:content-type; bh=2y+qvwd2dyMUJraLY7qsFGhDerhmwJowQw8HVRm6vVQ=; b=STke4fipEMaibFJU/rCrcv2bwqD5F2LzG6QBR0dhQlFVG/iDUOzcHGZbAS7gxbw3Fj d9QgEcijkbUhIzGmVKpY5YFjLlYLqOQf3lyX+cmFNCQn7R/WICpVqWyBIsnlWBgeWbgL 77bRf1BXhNvOKmkgXLv64vWbBZvVtYmblaz6c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:x-enigmail-version:content-type; b=skNX0U0TYGPl/h0tc4ulnAFVgqB03B5ZQ/Ful+8V+x4JxkZISAYYR7huOXVQWxjdOO Atfu+2ZZLQs0tfyPKOEnbAm43mMC2OnPUkjq93LBK9x1cA+AcqsAK53rt+pu20nicMlp vcVy5vWm+ifpQqblMEGeAPKZIWUwlTyUUveaw= Received: by 10.223.107.143 with SMTP id b15mr88012fap.102.1283959586798; Wed, 08 Sep 2010 08:26:26 -0700 (PDT) Received: from debian.bg45.phnet (224-225.62-81.cust.bluewin.ch [81.62.225.224]) by mx.google.com with ESMTPS id b36sm99204faq.35.2010.09.08.08.26.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 08 Sep 2010 08:26:25 -0700 (PDT) Message-ID: <4C87AB1A.9060208@gmail.com> Date: Wed, 08 Sep 2010 17:26:18 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100805 Icedove/3.0.6 MIME-Version: 1.0 To: grub-devel@gnu.org References: In-Reply-To: X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enigD0A963238394120875B81D6D" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: Re: [PATCH] MINIX file system version 3 support X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Sep 2010 15:26:38 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigD0A963238394120875B81D6D Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 07/28/2010 05:25 AM, Fam Zheng wrote: > Hi, > > To support MINIX file system version 3, this patch adds a new module > named 'minix3'. It reuses most of the code in minix.mod, and handles > the latest MINIX file system version 3. > > The requested assignment information has also been sent to > assign@gnu.org . > Please, ensure that patches have correct mime type. It's annoying to have to save them separately just to view. struct grub_minix_inode inode; struct grub_minix2_inode inode2; +#ifdef GRUB_MOD_MINIX3 inode and inode2 shouldn't be present in minix3 structure. +static unsigned int blocksize; + All FS info must be in _data structure. Otherwise 2 simultaneously mounted filesystems will conflict. +#ifdef GRUB_MOD_MINIX3 + first_dbl_indir=3Dindir_capacity+7; + if (blk < first_dbl_indir) + { + blk -=3D 7; + indir =3D grub_get_indir (GRUB_MINIX_INODE_INDIR_ZONE (data), blk)= ; + return indir; + } +#else Where does 7 come from? It must be macroified. + if(ino=3D=3D0) return GRUB_ERR_BAD_ARGUMENT; must be 2 lines and return should be return grub_error (GRUB_ERR_BAD_FS, "incorrect inode"); +#define GRUB_MOD_MINIX3 +#include "minix.c" It should be MODE_MINIX3 I'm now splitting minix.mod into minix.mod nd minix2.mod, once I'm finished please adjust your patch --=20 > Best Regards! > Fam Zheng > > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > http://lists.gnu.org/mailman/listinfo/grub-devel > =20 --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enigD0A963238394120875B81D6D Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAkyHqxoACgkQNak7dOguQgmKzQD+PyvadB0LQDWn8i5jzvw13tsS PotSNExbFIbtHQFY3DYBAI9CqXxJxFXWNLc3FndOgl+AZd6CFrH0U6pJpsCBQDZE =LcWu -----END PGP SIGNATURE----- --------------enigD0A963238394120875B81D6D-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1PqiQ6-0004QN-Mh for mharc-grub-devel@gnu.org; Sat, 19 Feb 2011 03:44:02 -0500 Received: from [140.186.70.92] (port=40405 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PqiQ4-0004Q3-KY for grub-devel@gnu.org; Sat, 19 Feb 2011 03:44:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PqiQ3-0000XC-EZ for grub-devel@gnu.org; Sat, 19 Feb 2011 03:44:00 -0500 Received: from mail-iw0-f169.google.com ([209.85.214.169]:58469) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PqiQ3-0000X1-Ay for grub-devel@gnu.org; Sat, 19 Feb 2011 03:43:59 -0500 Received: by iwl42 with SMTP id 42so1129417iwl.0 for ; Sat, 19 Feb 2011 00:43:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type:content-transfer-encoding; bh=4WJyk3Mthn+AvlytIeVng2miqdNaKIc5DYjlkAF70Z4=; b=kL59Yp1WNY3ps+uzFVlpIyYN7dFP4QQ5dTlEPzZNxl0BizwKCwCYDNhMWUgRcHE4w5 85LLfh2+3g1Rx4JSodGOLaJ/UyrCTjtAfZwriiKc+ZU+ndGBypuAOqKJuGlFH0yvl4TY RUqoAwfo6x1uC0DfCoXVvb4o/mh5guYnjqMh4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=h4kPPAo6QqErBde4zLClBQoyHp6jHylqpm82wC6NqX8iOGYn/Gzxd16lyS4FDNv0ho EkLoQkvzLZPCfUwcPJVriNZ/DAA7pPF0T4ZniySPllAiWRT0MGIzv6HmIpz561vApH5D PlDtzo1EM91tbOT+RmOo8JbFBMPKSduAO6tzw= Received: by 10.42.213.201 with SMTP id gx9mr2095674icb.163.1298105038041; Sat, 19 Feb 2011 00:43:58 -0800 (PST) MIME-Version: 1.0 Received: by 10.42.167.5 with HTTP; Sat, 19 Feb 2011 00:43:38 -0800 (PST) In-Reply-To: <4C87AB1A.9060208@gmail.com> References: <4C87AB1A.9060208@gmail.com> From: Fam Cook Date: Sat, 19 Feb 2011 16:43:38 +0800 Message-ID: To: The development of GNU GRUB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.169 Cc: =?UTF-8?Q?Vladimir_=27=CF=86=2Dcoder=2Fphcoder=27_Serbinenko?= , Arun Thomas , Erik van der Kouwe Subject: Re: [PATCH] MINIX file system version 3 support X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Feb 2011 08:44:01 -0000 As I've done the assignment of contributor copyright with FSF, I'd like to send this patch here once more, as introduced in quoting, it's for MINIX3 FS support. Already updated based on the latest trunk code, please check and notify me if more adjust needed. 2010/9/8 Vladimir '=CF=86-coder/phcoder' Serbinenko : > On 07/28/2010 05:25 AM, Fam Zheng wrote: >> Hi, >> >> To support MINIX file system version 3, this patch adds a new module >> named 'minix3'. It reuses most of the code in minix.mod, and handles >> the latest MINIX file system version 3. >> >> The requested assignment information has also been sent to >> assign@gnu.org . >> > Please, ensure that patches have correct mime type. It's annoying to > have to save them separately just to view. > =C2=A0 struct grub_minix_inode inode; > =C2=A0 struct grub_minix2_inode inode2; > +#ifdef GRUB_MOD_MINIX3 > inode and inode2 shouldn't be present in minix3 structure. > > +static unsigned int blocksize; > + > All FS info must be in _data structure. Otherwise 2 simultaneously > mounted filesystems will conflict. > +#ifdef GRUB_MOD_MINIX3 > + =C2=A0first_dbl_indir=3Dindir_capacity+7; > + =C2=A0if (blk < first_dbl_indir) > + =C2=A0 =C2=A0{ > + =C2=A0 =C2=A0 =C2=A0blk -=3D 7; > + =C2=A0 =C2=A0 =C2=A0indir =3D grub_get_indir (GRUB_MINIX_INODE_INDIR_ZO= NE (data), blk); > + =C2=A0 =C2=A0 =C2=A0return indir; > + =C2=A0 =C2=A0} > +#else > Where does 7 come from? It must be macroified. > > + =C2=A0if(ino=3D=3D0) return GRUB_ERR_BAD_ARGUMENT; > must be 2 lines and return should be return grub_error (GRUB_ERR_BAD_FS, > "incorrect inode"); > +#define GRUB_MOD_MINIX3 > +#include "minix.c" > It should be MODE_MINIX3 > I'm now splitting minix.mod into minix.mod nd minix2.mod, once I'm > finished please adjust your patch > -- >> Best Regards! >> Fam Zheng >> >> >> _______________________________________________ >> Grub-devel mailing list >> Grub-devel@gnu.org >> http://lists.gnu.org/mailman/listinfo/grub-devel >> > > > -- > Regards > Vladimir '=CF=86-coder/phcoder' Serbinenko > > > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > http://lists.gnu.org/mailman/listinfo/grub-devel > > -- Best regards! Fam Zheng From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1PqiRH-0004pm-St for mharc-grub-devel@gnu.org; Sat, 19 Feb 2011 03:45:16 -0500 Received: from [140.186.70.92] (port=40980 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PqiRF-0004nZ-7h for grub-devel@gnu.org; Sat, 19 Feb 2011 03:45:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PqiRD-0000lt-Tm for grub-devel@gnu.org; Sat, 19 Feb 2011 03:45:13 -0500 Received: from mail-iw0-f169.google.com ([209.85.214.169]:49415) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PqiRD-0000lV-Lf for grub-devel@gnu.org; Sat, 19 Feb 2011 03:45:11 -0500 Received: by iwl42 with SMTP id 42so1130001iwl.0 for ; Sat, 19 Feb 2011 00:45:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=W1ob/MOWr1kRbRiYX4lpYjkb7G4rxMUlmGX9eoW/NJA=; b=p310FaT9rU9BUUAd8QClx4rPIdVz9RbruLIBIYNY8CCZqhClviFKgr4ZcKeBQQeYHb ZOq7cZsS5Wecn+EW7148qqdiMsIEBlvEM47QvH/6UcpcxLG0V3o7uuaFLvTKLTq8GlND ShGTlv+K9Pc2fkuQrhqrdKZiSHOIniHnbeC+M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; b=YAodVf3HE0taAVbp0FTUgujwYsG4HUelZbgma5shpnj65jaABP+5bOkmp41WOQaDUt 9M7Wkk+xWNowxOc40Eu4chUnqjBEef4Bvh1f+XULZWj7HXD9N2Dw0TFLbFyprw/RaBNY lRoCn2E+/1DZHKBqKibb7ocb9rPjfwfo8TlPI= Received: by 10.42.222.193 with SMTP id ih1mr2109599icb.96.1298105111072; Sat, 19 Feb 2011 00:45:11 -0800 (PST) MIME-Version: 1.0 Received: by 10.42.167.5 with HTTP; Sat, 19 Feb 2011 00:44:50 -0800 (PST) In-Reply-To: References: <4C87AB1A.9060208@gmail.com> From: Fam Cook Date: Sat, 19 Feb 2011 16:44:50 +0800 Message-ID: To: The development of GNU GRUB Content-Type: multipart/mixed; boundary=20cf3043476606d270049c9ea6f9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.169 Cc: =?UTF-8?Q?Vladimir_=27=CF=86=2Dcoder=2Fphcoder=27_Serbinenko?= , Arun Thomas , Erik van der Kouwe Subject: Re: [PATCH] MINIX file system version 3 support X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Feb 2011 08:45:14 -0000 --20cf3043476606d270049c9ea6f9 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable oops, attachment missed. 2011/2/19 Fam Cook : > As I've done the assignment of contributor copyright with FSF, I'd > like to send this patch here once more, as introduced in quoting, it's > for MINIX3 FS support. Already updated based on the latest trunk code, > please check and notify me if more adjust needed. > > 2010/9/8 Vladimir '=CF=86-coder/phcoder' Serbinenko : >> On 07/28/2010 05:25 AM, Fam Zheng wrote: >>> Hi, >>> >>> To support MINIX file system version 3, this patch adds a new module >>> named 'minix3'. It reuses most of the code in minix.mod, and handles >>> the latest MINIX file system version 3. >>> >>> The requested assignment information has also been sent to >>> assign@gnu.org . >>> >> Please, ensure that patches have correct mime type. It's annoying to >> have to save them separately just to view. >> =C2=A0 struct grub_minix_inode inode; >> =C2=A0 struct grub_minix2_inode inode2; >> +#ifdef GRUB_MOD_MINIX3 >> inode and inode2 shouldn't be present in minix3 structure. >> >> +static unsigned int blocksize; >> + >> All FS info must be in _data structure. Otherwise 2 simultaneously >> mounted filesystems will conflict. >> +#ifdef GRUB_MOD_MINIX3 >> + =C2=A0first_dbl_indir=3Dindir_capacity+7; >> + =C2=A0if (blk < first_dbl_indir) >> + =C2=A0 =C2=A0{ >> + =C2=A0 =C2=A0 =C2=A0blk -=3D 7; >> + =C2=A0 =C2=A0 =C2=A0indir =3D grub_get_indir (GRUB_MINIX_INODE_INDIR_Z= ONE (data), blk); >> + =C2=A0 =C2=A0 =C2=A0return indir; >> + =C2=A0 =C2=A0} >> +#else >> Where does 7 come from? It must be macroified. >> >> + =C2=A0if(ino=3D=3D0) return GRUB_ERR_BAD_ARGUMENT; >> must be 2 lines and return should be return grub_error (GRUB_ERR_BAD_FS, >> "incorrect inode"); >> +#define GRUB_MOD_MINIX3 >> +#include "minix.c" >> It should be MODE_MINIX3 >> I'm now splitting minix.mod into minix.mod nd minix2.mod, once I'm >> finished please adjust your patch >> -- >>> Best Regards! >>> Fam Zheng >>> >>> >>> _______________________________________________ >>> Grub-devel mailing list >>> Grub-devel@gnu.org >>> http://lists.gnu.org/mailman/listinfo/grub-devel >>> >> >> >> -- >> Regards >> Vladimir '=CF=86-coder/phcoder' Serbinenko >> >> >> >> _______________________________________________ >> Grub-devel mailing list >> Grub-devel@gnu.org >> http://lists.gnu.org/mailman/listinfo/grub-devel >> >> > > > > -- > Best regards! > Fam Zheng > --=20 Best regards! Fam Zheng --20cf3043476606d270049c9ea6f9 Content-Type: application/octet-stream; name="minix3.patch" Content-Disposition: attachment; filename="minix3.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gkca8jbj0 PT09IG1vZGlmaWVkIGZpbGUgJ2dydWItY29yZS9NYWtlZmlsZS5jb3JlLmRlZicKLS0tIGdydWIt Y29yZS9NYWtlZmlsZS5jb3JlLmRlZgkyMDExLTAxLTE0IDE4OjIxOjA2ICswMDAwCisrKyBncnVi LWNvcmUvTWFrZWZpbGUuY29yZS5kZWYJMjAxMS0wMi0xOSAwNjozODozNiArMDAwMApAQCAtOTU5 LDYgKzk1OSwxMSBAQAogfTsKIAogbW9kdWxlID0geworICBuYW1lID0gbWluaXgzOworICBjb21t b24gPSBmcy9taW5peDMuYzsKK307CisKK21vZHVsZSA9IHsKICAgbmFtZSA9IG5pbGZzMjsKICAg Y29tbW9uID0gZnMvbmlsZnMyLmM7CiB9OwoKPT09IG1vZGlmaWVkIGZpbGUgJ2dydWItY29yZS9m cy9taW5peC5jJwotLS0gZ3J1Yi1jb3JlL2ZzL21pbml4LmMJMjAxMC0xMC0xNiAyMDoxNjo1MiAr MDAwMAorKysgZ3J1Yi1jb3JlL2ZzL21pbml4LmMJMjAxMS0wMi0xOSAwODoyODo1NCArMDAwMApA QCAtMTksMjAgKzE5LDI0IEBACiAKICNpbmNsdWRlIDxncnViL2Vyci5oPgogI2luY2x1ZGUgPGdy dWIvZmlsZS5oPgorI2luY2x1ZGUgPGdydWIvcGFydGl0aW9uLmg+CiAjaW5jbHVkZSA8Z3J1Yi9t bS5oPgogI2luY2x1ZGUgPGdydWIvbWlzYy5oPgogI2luY2x1ZGUgPGdydWIvZGlzay5oPgogI2lu Y2x1ZGUgPGdydWIvZGwuaD4KICNpbmNsdWRlIDxncnViL3R5cGVzLmg+CiAKLSNpZmRlZiBNT0RF X01JTklYMgorI2lmZGVmIE1PREVfTUlOSVgzCisjZGVmaW5lIEdSVUJfTUlOSVhfTUFHSUMJMHg0 RDVBCisjZWxpZiBkZWZpbmVkKE1PREVfTUlOSVgyKQogI2RlZmluZSBHUlVCX01JTklYX01BR0lD CTB4MjQ2OAogI2RlZmluZSBHUlVCX01JTklYX01BR0lDXzMwCTB4MjQ3OAogI2Vsc2UKICNkZWZp bmUgR1JVQl9NSU5JWF9NQUdJQwkweDEzN0YKICNkZWZpbmUgR1JVQl9NSU5JWF9NQUdJQ18zMAkw eDEzOEYKICNlbmRpZgotI2RlZmluZSBHUlVCX01JTklYX0JTSVpFCTEwMjRVCisKKyNkZWZpbmUg R1JVQl9NSU5JWF9JTk9ERV9ESVJfQkxPQ0tTCTcKICNkZWZpbmUgR1JVQl9NSU5JWF9MT0cyX0JT SVpFCTEKICNkZWZpbmUgR1JVQl9NSU5JWF9ST09UX0lOT0RFCTEKICNkZWZpbmUgR1JVQl9NSU5J WF9NQVhfU1lNTE5LX0NOVAk4CkBAIC00MSw3ICs0NSwxMCBAQAogI2RlZmluZSBHUlVCX01JTklY X0lGRElSCTAwNDAwMDBVCiAjZGVmaW5lIEdSVUJfTUlOSVhfSUZMTksJMDEyMDAwMFUKIAotI2lm ZGVmIE1PREVfTUlOSVgyCisjaWYgZGVmaW5lZChNT0RFX01JTklYMykKK3R5cGVkZWYgZ3J1Yl91 aW50MzJfdCBncnViX21pbml4X3VpbnRuX3Q7CisjZGVmaW5lIGdydWJfbWluaXhfbGVfdG9fY3B1 X24gZ3J1Yl9sZV90b19jcHUzMgorI2VsaWYgZGVmaW5lZChNT0RFX01JTklYMikKIHR5cGVkZWYg Z3J1Yl91aW50MzJfdCBncnViX21pbml4X3VpbnRuX3Q7CiAjZGVmaW5lIGdydWJfbWluaXhfbGVf dG9fY3B1X24gZ3J1Yl9sZV90b19jcHUzMgogI2Vsc2UKQEAgLTYyLDkgKzY5LDI4IEBACiAKICNk ZWZpbmUgR1JVQl9NSU5JWF9MT0cyX1pPTkVTWgkoR1JVQl9NSU5JWF9MT0cyX0JTSVpFCQkJCVwK IAkJCQkgKyBncnViX2xlX3RvX2NwdTE2IChzYmxvY2stPmxvZzJfem9uZV9zaXplKSkKLSNkZWZp bmUgR1JVQl9NSU5JWF9aT05FU1oJKEdSVUJfTUlOSVhfQlNJWkUgCQkJCVwKKyNkZWZpbmUgR1JV Ql9NSU5JWF9aT05FU1oJKGRhdGEtPmJsb2NrX3NpemUgCQkJCVwKIAkJCQkgPDwgZ3J1Yl9sZV90 b19jcHUxNiAoc2Jsb2NrLT5sb2cyX3pvbmVfc2l6ZSkpCiAKKyNpZmRlZiBNT0RFX01JTklYMwor c3RydWN0IGdydWJfbWluaXhfc2Jsb2NrCit7CisgIGdydWJfdWludDMyX3QgaW5vZGVfY250Owor ICBncnViX3VpbnQxNl90IHpvbmVfY250OworICBncnViX3VpbnQxNl90IGlub2RlX2JtYXBfc2l6 ZTsKKyAgZ3J1Yl91aW50MTZfdCB6b25lX2JtYXBfc2l6ZTsKKyAgZ3J1Yl91aW50MTZfdCBmaXJz dF9kYXRhX3pvbmU7CisgIGdydWJfdWludDE2X3QgbG9nMl96b25lX3NpemU7CisgIGdydWJfdWlu dDE2X3QgcGFkOworICBncnViX3VpbnQzMl90IG1heF9maWxlX3NpemU7CisgIGdydWJfdWludDMy X3Qgem9uZXM7CisgIGdydWJfdWludDE2X3QgbWFnaWM7CisgIAorICBncnViX3VpbnQxNl90IHBh ZDI7CisgIGdydWJfdWludDE2X3QgYmxvY2tfc2l6ZTsKKyAgZ3J1Yl91aW50OF90IGRpc2tfdmVy c2lvbjsgCit9OworI2Vsc2UKIHN0cnVjdCBncnViX21pbml4X3NibG9jawogewogICBncnViX3Vp bnQxNl90IGlub2RlX2NudDsKQEAgLTc2LDggKzEwMiwyOSBAQAogICBncnViX3VpbnQzMl90IG1h eF9maWxlX3NpemU7CiAgIGdydWJfdWludDE2X3QgbWFnaWM7CiB9OwotCi0jaWZuZGVmIE1PREVf TUlOSVgyCisjZW5kaWYKKworI2lmIGRlZmluZWQoTU9ERV9NSU5JWDMpCisKK3N0cnVjdCBncnVi X21pbml4X2lub2RlCit7CisgIGdydWJfdWludDE2X3QgbW9kZTsKKyAgZ3J1Yl91aW50MTZfdCBu bGlua3M7CisgIGdydWJfdWludDE2X3QgdWlkOworICBncnViX3VpbnQ4X3QgZ2lkOworICBncnVi X3VpbnQ4X3QgcGFkOworICBncnViX3VpbnQzMl90IHNpemU7CisgIGdydWJfdWludDMyX3QgYXRp bWU7CisgIGdydWJfdWludDMyX3QgbXRpbWU7CisgIGdydWJfdWludDMyX3QgY3RpbWU7CisgIGdy dWJfdWludDMyX3QgZGlyX3pvbmVzWzddOworICBncnViX3VpbnQzMl90IGluZGlyX3pvbmU7Cisg IGdydWJfdWludDMyX3QgZG91YmxlX2luZGlyX3pvbmU7CisgIGdydWJfdWludDMyX3QgdW51c2Vk OworCit9OworCisjZWxpZiBkZWZpbmVkKE1PREVfTUlOSVgyKQogc3RydWN0IGdydWJfbWluaXhf aW5vZGUKIHsKICAgZ3J1Yl91aW50MTZfdCBtb2RlOwpAQCAtMTIxLDYgKzE2OCw4IEBACiAgIGlu dCBsaW5rbmVzdDsKICAgZ3J1Yl9kaXNrX3QgZGlzazsKICAgaW50IGZpbGVuYW1lX3NpemU7Cisg IGdydWJfdWludDE2X3QgYmxvY2tfc2l6ZTsKKyAgZ3J1Yl91aW50MTZfdCBpbm9fc2l6ZTsKIH07 CiAKIHN0YXRpYyBncnViX2RsX3QgbXlfbW9kOwpAQCAtMTQwLDE5ICsxODksMjYgQEAKICAgaW50 IGdydWJfZ2V0X2luZGlyIChpbnQgem9uZSwgaW50IG51bSkKICAgICB7CiAgICAgICBncnViX21p bml4X3VpbnRuX3QgaW5kaXJuOworI2lmZGVmIE1PREVfTUlOSVgzCisgICAgICBncnViX2Rpc2tf cmVhZCAoZGF0YS0+ZGlzaywKKyAgICAgICAgICAgICAgICAgICAgICB6b25lICogKGRhdGEtPmJs b2NrX3NpemUgLyBHUlVCX0RJU0tfU0VDVE9SX1NJWkUpLAorICAgICAgICAgICAgICAgICAgICAg IHNpemVvZiAoZ3J1Yl91aW50MzJfdCkgKiBudW0sCisgICAgICAgICAgICAgICAgICAgICAgc2l6 ZW9mIChncnViX3VpbnQzMl90KSwgKGNoYXIgKikgJmluZGlybik7CisjZWxzZQogICAgICAgZ3J1 Yl9kaXNrX3JlYWQgKGRhdGEtPmRpc2ssCiAJCSAgICAgIHpvbmUgPDwgR1JVQl9NSU5JWF9MT0cy X1pPTkVTWiwKIAkJICAgICAgc2l6ZW9mIChncnViX21pbml4X3VpbnRuX3QpICogbnVtLAogCQkg ICAgICBzaXplb2YgKGdydWJfbWluaXhfdWludG5fdCksIChjaGFyICopICZpbmRpcm4pOworI2Vu ZGlmCiAgICAgICByZXR1cm4gZ3J1Yl9taW5peF9sZV90b19jcHVfbiAoaW5kaXJuKTsKICAgICB9 CiAKICAgLyogRGlyZWN0IGJsb2NrLiAgKi8KLSAgaWYgKGJsayA8IDcpCisgIGlmIChibGsgPCBH UlVCX01JTklYX0lOT0RFX0RJUl9CTE9DS1MpCiAgICAgcmV0dXJuIEdSVUJfTUlOSVhfSU5PREVf RElSX1pPTkVTIChkYXRhLCBibGspOwogCiAgIC8qIEluZGlyZWN0IGJsb2NrLiAgKi8KLSAgYmxr IC09IDc7CisgIGJsayAtPSBHUlVCX01JTklYX0lOT0RFX0RJUl9CTE9DS1M7CiAgIGlmIChibGsg PCBHUlVCX01JTklYX1pPTkVTWiAvIEdSVUJfTUlOSVhfSU5PREVfQkxLU1ogKGRhdGEpKQogICAg IHsKICAgICAgIGluZGlyID0gZ3J1Yl9nZXRfaW5kaXIgKEdSVUJfTUlOSVhfSU5PREVfSU5ESVJf Wk9ORSAoZGF0YSksIGJsayk7CkBAIC0xOTUsNDUgKzI1MSw0OSBAQAogICBpZiAobGVuICsgcG9z ID4gR1JVQl9NSU5JWF9JTk9ERV9TSVpFIChkYXRhKSkKICAgICBsZW4gPSBHUlVCX01JTklYX0lO T0RFX1NJWkUgKGRhdGEpIC0gcG9zOwogCi0gIGJsb2NrY250ID0gKGxlbiArIHBvcyArIEdSVUJf TUlOSVhfQlNJWkUgLSAxKSAvIEdSVUJfTUlOSVhfQlNJWkU7CisgIGJsb2NrY250ID0gKHVuc2ln bmVkKShsZW4gKyBwb3MgKyBkYXRhLT5ibG9ja19zaXplIC0gMSkgLyBkYXRhLT5ibG9ja19zaXpl OwogCi0gIGZvciAoaSA9IHBvcyAvIEdSVUJfTUlOSVhfQlNJWkU7IGkgPCBibG9ja2NudDsgaSsr KQorICBmb3IgKGkgPSBwb3MgLyBkYXRhLT5ibG9ja19zaXplOyBpIDwgYmxvY2tjbnQ7IGkrKykK ICAgICB7CiAgICAgICBpbnQgYmxrbnI7Ci0gICAgICBpbnQgYmxvY2tvZmYgPSBwb3MgJSBHUlVC X01JTklYX0JTSVpFOwotICAgICAgaW50IGJsb2NrZW5kID0gR1JVQl9NSU5JWF9CU0laRTsKKyAg ICAgIGludCBibG9ja29mZiA9ICh1bnNpZ25lZClwb3MgJSBkYXRhLT5ibG9ja19zaXplOworICAg ICAgaW50IGJsb2NrZW5kID0gZGF0YS0+YmxvY2tfc2l6ZTsKIAogICAgICAgaW50IHNraXBmaXJz dCA9IDA7CiAKICAgICAgIGJsa25yID0gZ3J1Yl9taW5peF9nZXRfZmlsZV9ibG9jayAoZGF0YSwg aSk7CiAgICAgICBpZiAoZ3J1Yl9lcnJubykKIAlyZXR1cm4gLTE7Ci0KICAgICAgIC8qIExhc3Qg YmxvY2suICAqLwogICAgICAgaWYgKGkgPT0gYmxvY2tjbnQgLSAxKQogCXsKLQkgIGJsb2NrZW5k ID0gKGxlbiArIHBvcykgJSBHUlVCX01JTklYX0JTSVpFOworCSAgYmxvY2tlbmQgPSAodW5zaWdu ZWQpKGxlbiArIHBvcykgJSBkYXRhLT5ibG9ja19zaXplOwogCiAJICBpZiAoIWJsb2NrZW5kKQot CSAgICBibG9ja2VuZCA9IEdSVUJfTUlOSVhfQlNJWkU7CisJICAgIGJsb2NrZW5kID0gZGF0YS0+ YmxvY2tfc2l6ZTsKIAl9CiAKICAgICAgIC8qIEZpcnN0IGJsb2NrLiAgKi8KLSAgICAgIGlmIChp ID09IChwb3MgLyAoaW50KSBHUlVCX01JTklYX0JTSVpFKSkKKyAgICAgIGlmIChpID09IChwb3Mg LyAoaW50KSBkYXRhLT5ibG9ja19zaXplKSkKIAl7CiAJICBza2lwZmlyc3QgPSBibG9ja29mZjsK IAkgIGJsb2NrZW5kIC09IHNraXBmaXJzdDsKIAl9CiAKICAgICAgIGRhdGEtPmRpc2stPnJlYWRf aG9vayA9IHJlYWRfaG9vazsKKyNpZmRlZiBNT0RFX01JTklYMworICAgICAgZ3J1Yl9kaXNrX3Jl YWQgKGRhdGEtPmRpc2ssIGJsa25yICogCisgICAgICAgIChzYmxvY2stPmJsb2NrX3NpemUgLyBH UlVCX0RJU0tfU0VDVE9SX1NJWkUpLAorICAgICAgICBza2lwZmlyc3QsIGJsb2NrZW5kLCBidWYp OworI2Vsc2UKICAgICAgIGdydWJfZGlza19yZWFkIChkYXRhLT5kaXNrLCBibGtuciA8PCBHUlVC X01JTklYX0xPRzJfWk9ORVNaLAogCQkgICAgICBza2lwZmlyc3QsIGJsb2NrZW5kLCBidWYpOwot CisjZW5kaWYKICAgICAgIGRhdGEtPmRpc2stPnJlYWRfaG9vayA9IDA7CiAgICAgICBpZiAoZ3J1 Yl9lcnJubykKIAlyZXR1cm4gLTE7CiAKLSAgICAgIGJ1ZiArPSBHUlVCX01JTklYX0JTSVpFIC0g c2tpcGZpcnN0OworICAgICAgYnVmICs9IGRhdGEtPmJsb2NrX3NpemUgLSBza2lwZmlyc3Q7CiAg ICAgfQogCiAgIHJldHVybiBsZW47CkBAIC0yNTMsMTEgKzMxMywxNSBAQAogCiAgIC8qIFRoZSBm aXJzdCBpbm9kZSBpbiBtaW5peCBpcyBpbm9kZSAxLiAgKi8KICAgaW5vLS07Ci0KKyNpZm5kZWYg TU9ERV9NSU5JWDMKICAgYmxvY2sgPSAoKDIgKyBncnViX2xlX3RvX2NwdTE2IChzYmxvY2stPmlu b2RlX2JtYXBfc2l6ZSkKIAkgICAgKyBncnViX2xlX3RvX2NwdTE2IChzYmxvY2stPnpvbmVfYm1h cF9zaXplKSkKIAkgICA8PCBHUlVCX01JTklYX0xPRzJfQlNJWkUpOwotCisjZWxzZQorICBibG9j ayA9ICgoMiArIGdydWJfbGVfdG9fY3B1MTYgKHNibG9jay0+aW5vZGVfYm1hcF9zaXplKQorCSAg ICArIGdydWJfbGVfdG9fY3B1MTYgKHNibG9jay0+em9uZV9ibWFwX3NpemUpKQorCSAgICooc2Js b2NrLT5ibG9ja19zaXplL0dSVUJfRElTS19TRUNUT1JfU0laRSkpOworI2VuZGlmCiAgIGJsb2Nr ICs9IGlubyAvIChHUlVCX0RJU0tfU0VDVE9SX1NJWkUgLyBzaXplb2YgKHN0cnVjdCBncnViX21p bml4X2lub2RlKSk7CiAgIGludCBvZmZzID0gKGlubyAlIChHUlVCX0RJU0tfU0VDVE9SX1NJWkUK IAkJICAgICAvIHNpemVvZiAoc3RydWN0IGdydWJfbWluaXhfaW5vZGUpKQpAQCAtMzMzLDE2ICsz OTcsMTYgQEAKIAogICBkbwogICAgIHsKLSAgICAgIGdydWJfdWludDE2X3QgaW5vOworICAgICAg Z3J1Yl9taW5peF91aW50bl90IGlubzsKICAgICAgIGNoYXIgZmlsZW5hbWVbZGF0YS0+ZmlsZW5h bWVfc2l6ZSArIDFdOwogCiAgICAgICBpZiAoZ3J1Yl9zdHJsZW4gKG5hbWUpID09IDApCiAJcmV0 dXJuIEdSVUJfRVJSX05PTkU7CiAKLSAgICAgIGlmIChncnViX21pbml4X3JlYWRfZmlsZSAoZGF0 YSwgMCwgcG9zLCBzaXplb2YgKGlubyksCisgICAgICBpZiAoZ3J1Yl9taW5peF9yZWFkX2ZpbGUg KGRhdGEsIDAsIHBvcywgR1JVQl9NSU5JWF9JTk9ERV9CTEtTWihkYXRhKSwKIAkJCQkoY2hhciAq KSAmaW5vKSA8IDApCiAJcmV0dXJuIGdydWJfZXJybm87Ci0gICAgICBpZiAoZ3J1Yl9taW5peF9y ZWFkX2ZpbGUgKGRhdGEsIDAsIHBvcyArIHNpemVvZiAoaW5vKSwKKyAgICAgIGlmIChncnViX21p bml4X3JlYWRfZmlsZSAoZGF0YSwgMCwgcG9zICsgR1JVQl9NSU5JWF9JTk9ERV9CTEtTWihkYXRh KSwKIAkJCQlkYXRhLT5maWxlbmFtZV9zaXplLCAoY2hhciAqKSBmaWxlbmFtZSk8IDApCiAJcmV0 dXJuIGdydWJfZXJybm87CiAKQEAgLTQwNywyMiArNDcxLDM3IEBACiAJCSAgc2l6ZW9mIChzdHJ1 Y3QgZ3J1Yl9taW5peF9zYmxvY2spLCZkYXRhLT5zYmxvY2spOwogICBpZiAoZ3J1Yl9lcnJubykK ICAgICBnb3RvIGZhaWw7Ci0KICAgaWYgKGdydWJfbGVfdG9fY3B1MTYgKGRhdGEtPnNibG9jay5t YWdpYykgPT0gR1JVQl9NSU5JWF9NQUdJQykKKyAgeworI2lmICFkZWZpbmVkKE1PREVfTUlOSVgz KQogICAgIGRhdGEtPmZpbGVuYW1lX3NpemUgPSAxNDsKKyNlbHNlCisgICAgZGF0YS0+ZmlsZW5h bWVfc2l6ZSA9IDYwOworI2VuZGlmCisgIH0KKyNpZiAhZGVmaW5lZChNT0RFX01JTklYMykKICAg ZWxzZSBpZiAoZ3J1Yl9sZV90b19jcHUxNiAoZGF0YS0+c2Jsb2NrLm1hZ2ljKSA9PSBHUlVCX01J TklYX01BR0lDXzMwKQogICAgIGRhdGEtPmZpbGVuYW1lX3NpemUgPSAzMDsKKyNlbmRpZgogICBl bHNlCiAgICAgZ290byBmYWlsOwogCiAgIGRhdGEtPmRpc2sgPSBkaXNrOwogICBkYXRhLT5saW5r bmVzdCA9IDA7Ci0KKyNpZmRlZiBNT0RFX01JTklYMworICBkYXRhLT5ibG9ja19zaXplID0gZGF0 YS0+c2Jsb2NrLmJsb2NrX3NpemU7CisgIGRhdGEtPmlub19zaXplID0gNDsKKyNlbHNlCisgIGRh dGEtPmJsb2NrX3NpemUgPSAxMDI0VTsKKyAgZGF0YS0+aW5vX3NpemUgPSAyOworI2VuZGlmCiAg IHJldHVybiBkYXRhOwogCiAgZmFpbDoKICAgZ3J1Yl9mcmVlIChkYXRhKTsKLSNpZmRlZiBNT0RF X01JTklYMgorI2lmIGRlZmluZWQoTU9ERV9NSU5JWDMpCisgIGdydWJfZXJyb3IgKEdSVUJfRVJS X0JBRF9GUywgIm5vdCBhIG1pbml4MyBmaWxlc3lzdGVtIik7CisjZWxpZiBkZWZpbmVkKE1PREVf TUlOSVgyKQogICBncnViX2Vycm9yIChHUlVCX0VSUl9CQURfRlMsICJub3QgYSBtaW5peDIgZmls ZXN5c3RlbSIpOwogI2Vsc2UKICAgZ3J1Yl9lcnJvciAoR1JVQl9FUlJfQkFEX0ZTLCAibm90IGEg bWluaXggZmlsZXN5c3RlbSIpOwpAQCAtNDM3LDExICs1MTYsOSBAQAogewogICBzdHJ1Y3QgZ3J1 Yl9taW5peF9kYXRhICpkYXRhID0gMDsKICAgdW5zaWduZWQgaW50IHBvcyA9IDA7Ci0KICAgZGF0 YSA9IGdydWJfbWluaXhfbW91bnQgKGRldmljZS0+ZGlzayk7CiAgIGlmICghZGF0YSkKICAgICBy ZXR1cm4gZ3J1Yl9lcnJubzsKLQogICBncnViX21pbml4X3JlYWRfaW5vZGUgKGRhdGEsIEdSVUJf TUlOSVhfUk9PVF9JTk9ERSk7CiAgIGlmIChncnViX2Vycm5vKQogICAgIGdvdG8gZmFpbDsKQEAg LTQ1OCwzNSArNTM1LDMzIEBACiAKICAgd2hpbGUgKHBvcyA8IEdSVUJfTUlOSVhfSU5PREVfU0la RSAoZGF0YSkpCiAgICAgewotICAgICAgZ3J1Yl91aW50MTZfdCBpbm87CisgICAgICBncnViX3Vp bnQzMl90IGlubzsKICAgICAgIGNoYXIgZmlsZW5hbWVbZGF0YS0+ZmlsZW5hbWVfc2l6ZSArIDFd OwogICAgICAgaW50IGRpcmlubyA9IGRhdGEtPmlubzsKICAgICAgIHN0cnVjdCBncnViX2Rpcmhv b2tfaW5mbyBpbmZvOwogICAgICAgZ3J1Yl9tZW1zZXQgKCZpbmZvLCAwLCBzaXplb2YgKGluZm8p KTsKIAotCi0gICAgICBpZiAoZ3J1Yl9taW5peF9yZWFkX2ZpbGUgKGRhdGEsIDAsIHBvcywgc2l6 ZW9mIChpbm8pLAorICAgICAgaWYgKGdydWJfbWluaXhfcmVhZF9maWxlIChkYXRhLCAwLCBwb3Ms IGRhdGEtPmlub19zaXplLAogCQkJCShjaGFyICopICZpbm8pIDwgMCkKIAlyZXR1cm4gZ3J1Yl9l cnJubzsKLQotICAgICAgaWYgKGdydWJfbWluaXhfcmVhZF9maWxlIChkYXRhLCAwLCBwb3MgKyBz aXplb2YgKGlubyksCisgICAgICBpZiAoZ3J1Yl9taW5peF9yZWFkX2ZpbGUgKGRhdGEsIDAsIHBv cyArIGRhdGEtPmlub19zaXplLAogCQkJCWRhdGEtPmZpbGVuYW1lX3NpemUsCiAJCQkJKGNoYXIg KikgZmlsZW5hbWUpIDwgMCkKIAlyZXR1cm4gZ3J1Yl9lcnJubzsKICAgICAgIGZpbGVuYW1lW2Rh dGEtPmZpbGVuYW1lX3NpemVdID0gJ1wwJzsKLQotICAgICAgLyogVGhlIGZpbGV0eXBlIGlzIG5v dCBzdG9yZWQgaW4gdGhlIGRpcmVudC4gIFJlYWQgdGhlIGlub2RlIHRvCi0JIGZpbmQgb3V0IHRo ZSBmaWxldHlwZS4gIFRoaXMgKlJFQUxMWSogc3Vja3MuICAqLwotICAgICAgZ3J1Yl9taW5peF9y ZWFkX2lub2RlIChkYXRhLCBncnViX2xlX3RvX2NwdTE2IChpbm8pKTsKLSAgICAgIGluZm8uZGly ID0gKChHUlVCX01JTklYX0lOT0RFX01PREUgKGRhdGEpCi0JCSAgICYgR1JVQl9NSU5JWF9JRkRJ UikgPT0gR1JVQl9NSU5JWF9JRkRJUik7Ci0gICAgICBpZiAoaG9vayAoZmlsZW5hbWUsICZpbmZv KSA/IDEgOiAwKQotCWJyZWFrOwotCi0gICAgICAvKiBMb2FkIHRoZSBvbGQgaW5vZGUgYmFjayBp bi4gICovCi0gICAgICBncnViX21pbml4X3JlYWRfaW5vZGUgKGRhdGEsIGRpcmlubyk7Ci0KLSAg ICAgIHBvcyArPSBzaXplb2YgKGlubykgKyBkYXRhLT5maWxlbmFtZV9zaXplOworICAgICAgaWYo aW5vKQorICAgICAgeworICAgICAgICAvKiBUaGUgZmlsZXR5cGUgaXMgbm90IHN0b3JlZCBpbiB0 aGUgZGlyZW50LiAgUmVhZCB0aGUgaW5vZGUgdG8KKwkgICBmaW5kIG91dCB0aGUgZmlsZXR5cGUu ICBUaGlzICpSRUFMTFkqIHN1Y2tzLiAgKi8KKyAgICAgICAgZ3J1Yl9taW5peF9yZWFkX2lub2Rl IChkYXRhLCBncnViX2xlX3RvX2NwdTE2IChpbm8pKTsKKyAgICAgICAgaW5mby5kaXIgPSAoKEdS VUJfTUlOSVhfSU5PREVfTU9ERSAoZGF0YSkKKwkgIAkgICAmIEdSVUJfTUlOSVhfSUZESVIpID09 IEdSVUJfTUlOSVhfSUZESVIpOworICAgICAgICBpZiAoaG9vayAoZmlsZW5hbWUsICZpbmZvKSA/ IDEgOiAwKQorCSAgYnJlYWs7CisgICAgICAgIC8qIExvYWQgdGhlIG9sZCBpbm9kZSBiYWNrIGlu LiAgKi8KKyAgICAgICAgZ3J1Yl9taW5peF9yZWFkX2lub2RlIChkYXRhLCBkaXJpbm8pOworICAg ICAgfQorICAgICAgcG9zICs9IGRhdGEtPmlub19zaXplICsgZGF0YS0+ZmlsZW5hbWVfc2l6ZTsK ICAgICB9CiAKICBmYWlsOgpAQCAtNTU2LDcgKzYzMSw5IEBACiAMCiBzdGF0aWMgc3RydWN0IGdy dWJfZnMgZ3J1Yl9taW5peF9mcyA9CiAgIHsKLSNpZmRlZiBNT0RFX01JTklYMgorI2lmIGRlZmlu ZWQoTU9ERV9NSU5JWDMpCisgICAgLm5hbWUgPSAibWluaXgzIiwKKyNlbGlmIGRlZmluZWQoTU9E RV9NSU5JWDIpCiAgICAgLm5hbWUgPSAibWluaXgyIiwKICNlbHNlCiAgICAgLm5hbWUgPSAibWlu aXgiLApAQCAtNTY4LDcgKzY0NSw5IEBACiAgICAgLm5leHQgPSAwCiAgIH07CiAKLSNpZmRlZiBN T0RFX01JTklYMgorI2lmIGRlZmluZWQoTU9ERV9NSU5JWDMpCitHUlVCX01PRF9JTklUKG1pbml4 MykKKyNlbGlmIGRlZmluZWQoTU9ERV9NSU5JWDIpCiBHUlVCX01PRF9JTklUKG1pbml4MikKICNl bHNlCiBHUlVCX01PRF9JTklUKG1pbml4KQpAQCAtNTc4LDcgKzY1Nyw5IEBACiAgIG15X21vZCA9 IG1vZDsKIH0KIAotI2lmZGVmIE1PREVfTUlOSVgyCisjaWYgZGVmaW5lZChNT0RFX01JTklYMykK K0dSVUJfTU9EX0ZJTkkobWluaXgzKQorI2VsaWYgZGVmaW5lZChNT0RFX01JTklYMikKIEdSVUJf TU9EX0ZJTkkobWluaXgyKQogI2Vsc2UKIEdSVUJfTU9EX0ZJTkkobWluaXgpCgo9PT0gYWRkZWQg ZmlsZSAnZ3J1Yi1jb3JlL2ZzL21pbml4My5jJwotLS0gZ3J1Yi1jb3JlL2ZzL21pbml4My5jCTE5 NzAtMDEtMDEgMDA6MDA6MDAgKzAwMDAKKysrIGdydWItY29yZS9mcy9taW5peDMuYwkyMDExLTAy LTE5IDA2OjUwOjQ2ICswMDAwCkBAIC0wLDAgKzEsMiBAQAorI2RlZmluZSBNT0RFX01JTklYMyAx CisjaW5jbHVkZSAibWluaXguYyIKCg== --20cf3043476606d270049c9ea6f9-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1PqmIS-00088j-Op for mharc-grub-devel@gnu.org; Sat, 19 Feb 2011 07:52:24 -0500 Received: from [140.186.70.92] (port=44212 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PqmIQ-00088b-28 for grub-devel@gnu.org; Sat, 19 Feb 2011 07:52:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PqmIO-00066y-FL for grub-devel@gnu.org; Sat, 19 Feb 2011 07:52:21 -0500 Received: from mail-ew0-f41.google.com ([209.85.215.41]:38410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PqmIO-00066n-A1 for grub-devel@gnu.org; Sat, 19 Feb 2011 07:52:20 -0500 Received: by ewy10 with SMTP id 10so280699ewy.0 for ; Sat, 19 Feb 2011 04:52:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:x-enigmail-version:content-type; bh=Lsv5XRgQErRMyVz3UvBUZdjESrmZoHY7kMiGuxKpfdw=; b=m/cA42Xt419szkVMKSHGUyU4km9B0ZRn6UEJ2Un9gBxX78Ynn3xkgmcer9y8djnbyb VupGMzGow3jCMsMbzYk4no64P9VU0yE9NlL1ltCtiNLO7Hyp+ejVt80kxoxczNIE/QpM PpDtjHxwgQB3xnOnRZ0uXZtl8NoeguUbOyaF0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type; b=SsRl74MAdbQ1kAgHKV8q3qze7K35HtsGPlowyRYMAJHkOcar+iBanegLDyBjYjywEK +IrNBhhGQZZUnBHiSqcIP2wJk5erCbwH/1uyVJrQb97cK+deKRDzr06Ad0BZ7SLAsVKe GYzto2WiQvfwaMPRzXyTffzwi4Tx3VwezNvHY= Received: by 10.14.29.77 with SMTP id h53mr2116633eea.18.1298119938748; Sat, 19 Feb 2011 04:52:18 -0800 (PST) Received: from debian.x201.phnet (67-84.62-81.cust.bluewin.ch [81.62.84.67]) by mx.google.com with ESMTPS id b52sm2877484eei.13.2011.02.19.04.52.14 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 19 Feb 2011 04:52:17 -0800 (PST) Message-ID: <4D5FBCF2.1080308@gmail.com> Date: Sat, 19 Feb 2011 13:52:02 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20101226 Icedove/3.0.11 MIME-Version: 1.0 To: Fam Cook References: <4C87AB1A.9060208@gmail.com> In-Reply-To: X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig1CED99589B2C801E0344E052" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.215.41 Cc: The development of GNU GRUB , Arun Thomas , Erik van der Kouwe Subject: Re: [PATCH] MINIX file system version 3 support X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Feb 2011 12:52:23 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig1CED99589B2C801E0344E052 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 02/19/2011 09:43 AM, Fam Cook wrote: > As I've done the assignment of contributor copyright with FSF, I'd > like to send this patch here once more, as introduced in quoting, it's > for MINIX3 FS support. Already updated based on the latest trunk code, > please check and notify me if more adjust needed. > > =20 I know. I've seen it but I've been travelling so unfortunately haven't handled it yet. > 2010/9/8 Vladimir '=CF=86-coder/phcoder' Serbinenko = : > =20 >> On 07/28/2010 05:25 AM, Fam Zheng wrote: >> =20 >>> Hi, >>> >>> To support MINIX file system version 3, this patch adds a new module >>> named 'minix3'. It reuses most of the code in minix.mod, and handles >>> the latest MINIX file system version 3. >>> >>> The requested assignment information has also been sent to >>> assign@gnu.org . >>> >>> =20 >> Please, ensure that patches have correct mime type. It's annoying to >> have to save them separately just to view. >> struct grub_minix_inode inode; >> struct grub_minix2_inode inode2; >> +#ifdef GRUB_MOD_MINIX3 >> inode and inode2 shouldn't be present in minix3 structure. >> >> +static unsigned int blocksize; >> + >> All FS info must be in _data structure. Otherwise 2 simultaneously >> mounted filesystems will conflict. >> +#ifdef GRUB_MOD_MINIX3 >> + first_dbl_indir=3Dindir_capacity+7; >> + if (blk < first_dbl_indir) >> + { >> + blk -=3D 7; >> + indir =3D grub_get_indir (GRUB_MINIX_INODE_INDIR_ZONE (data), b= lk); >> + return indir; >> + } >> +#else >> Where does 7 come from? It must be macroified. >> >> + if(ino=3D=3D0) return GRUB_ERR_BAD_ARGUMENT; >> must be 2 lines and return should be return grub_error (GRUB_ERR_BAD_F= S, >> "incorrect inode"); >> +#define GRUB_MOD_MINIX3 >> +#include "minix.c" >> It should be MODE_MINIX3 >> I'm now splitting minix.mod into minix.mod nd minix2.mod, once I'm >> finished please adjust your patch >> -- >> =20 >>> Best Regards! >>> Fam Zheng >>> >>> >>> _______________________________________________ >>> Grub-devel mailing list >>> Grub-devel@gnu.org >>> http://lists.gnu.org/mailman/listinfo/grub-devel >>> >>> =20 >> >> -- >> Regards >> Vladimir '=CF=86-coder/phcoder' Serbinenko >> >> >> >> _______________________________________________ >> Grub-devel mailing list >> Grub-devel@gnu.org >> http://lists.gnu.org/mailman/listinfo/grub-devel >> >> >> =20 > > > -- > Best regards! > Fam Zheng > > =20 --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enig1CED99589B2C801E0344E052 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAk1fvPwACgkQNak7dOguQgnoUQD9HatMEb/fB4ZnbjqRLfaWwple YytTW9Gf329skRHPEhkA/2x5h+lZzpIciEKtFzSVekVjsgjdog0CY7aJDyihDJ7a =H2jd -----END PGP SIGNATURE----- --------------enig1CED99589B2C801E0344E052-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Q8zXg-0000eJ-O9 for mharc-grub-devel@gnu.org; Sun, 10 Apr 2011 14:39:24 -0400 Received: from [140.186.70.92] (port=56609 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q8zXd-0000Yd-1y for grub-devel@gnu.org; Sun, 10 Apr 2011 14:39:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q8zXb-0006rB-2o for grub-devel@gnu.org; Sun, 10 Apr 2011 14:39:20 -0400 Received: from mail-ww0-f49.google.com ([74.125.82.49]:62943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q8zXa-0006qp-P9 for grub-devel@gnu.org; Sun, 10 Apr 2011 14:39:18 -0400 Received: by wwb39 with SMTP id 39so5104351wwb.30 for ; Sun, 10 Apr 2011 11:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:x-enigmail-version:content-type; bh=ftqr4wFhYc9+08DSXu/NNt9xy4tX44K5Deb93muEO1I=; b=IC4wdjENZNL7/H8eDkzOqpf0FGvmtaBhWacdcnNDXwuKPGN1iu0FogdrhcQWi/0Cgw pYd6zHb4vtszdC07Zq5HZkqB+2xsFia4nOHDoRA26XrDDtWopXMLpI4btdm77jygVtez mS2CdjLVP/McbvoDY45ZhpVO0eSiUVmtqnWZc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type; b=qkUHcj7tikhxYLOm2JcZqRGAXrB8jIsYSvbgCQnMXe3XTQNjii+dvTd0u0h5KjjmgZ WSPvhqxH/vdxSGjkYbbhPwgbSQv43cgf0+nYSFy0n/UW2Zv8ssR5tOLRNqohbz7b8Ma/ vWH1495k9F+UAsB/QNLRX2SlUUCIxnVF3yIDM= Received: by 10.216.58.200 with SMTP id q50mr518010wec.83.1302460756863; Sun, 10 Apr 2011 11:39:16 -0700 (PDT) Received: from debian.x201.phnet (200-57.62-81.cust.bluewin.ch [81.62.57.200]) by mx.google.com with ESMTPS id r80sm2292783wei.15.2011.04.10.11.39.12 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Apr 2011 11:39:14 -0700 (PDT) Message-ID: <4DA1F948.4020506@gmail.com> Date: Sun, 10 Apr 2011 20:39:04 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110402 Iceowl/1.0b2 Icedove/3.1.9 MIME-Version: 1.0 To: The development of GNU GRUB References: In-Reply-To: X-Enigmail-Version: 1.1.2 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig182F470F883926A4AC014AE9" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.49 Cc: Fam Zheng Subject: Re: [PATCH] MINIX file system version 3 support X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Apr 2011 18:39:22 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig182F470F883926A4AC014AE9 Content-Type: multipart/mixed; boundary="------------040703060209030500080100" This is a multi-part message in MIME format. --------------040703060209030500080100 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 28.07.2010 05:25, Fam Zheng wrote: > Hi, > > To support MINIX file system version 3, this patch adds a new module > named 'minix3'. It reuses most of the code in minix.mod, and handles > the latest MINIX file system version 3. > I've cleaned it up. Could you test it and point me as to where I can get an minix3 image for my own tests? > The requested assignment information has also been sent to > assign@gnu.org . > > --=20 > Best Regards! > Fam Zheng > > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > http://lists.gnu.org/mailman/listinfo/grub-devel --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------040703060209030500080100 Content-Type: text/x-diff; name="minix3.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="minix3.diff" =3D=3D=3D modified file 'grub-core/Makefile.core.def' --- grub-core/Makefile.core.def 2011-03-26 11:59:02 +0000 +++ grub-core/Makefile.core.def 2011-04-10 15:36:48 +0000 @@ -959,6 +959,11 @@ }; =20 module =3D { + name =3D minix3; + common =3D fs/minix3.c; +}; + +module =3D { name =3D nilfs2; common =3D fs/nilfs2.c; }; =3D=3D=3D modified file 'grub-core/fs/minix.c' --- grub-core/fs/minix.c 2010-10-16 20:16:52 +0000 +++ grub-core/fs/minix.c 2011-04-10 16:35:06 +0000 @@ -25,14 +25,17 @@ #include #include =20 -#ifdef MODE_MINIX2 +#ifdef MODE_MINIX3 +#define GRUB_MINIX_MAGIC 0x4D5A +#elif defined(MODE_MINIX2) #define GRUB_MINIX_MAGIC 0x2468 #define GRUB_MINIX_MAGIC_30 0x2478 #else #define GRUB_MINIX_MAGIC 0x137F #define GRUB_MINIX_MAGIC_30 0x138F #endif -#define GRUB_MINIX_BSIZE 1024U + +#define GRUB_MINIX_INODE_DIR_BLOCKS 7 #define GRUB_MINIX_LOG2_BSIZE 1 #define GRUB_MINIX_ROOT_INODE 1 #define GRUB_MINIX_MAX_SYMLNK_CNT 8 @@ -41,7 +44,7 @@ #define GRUB_MINIX_IFDIR 0040000U #define GRUB_MINIX_IFLNK 0120000U =20 -#ifdef MODE_MINIX2 +#if defined(MODE_MINIX2) || defined(MODE_MINIX3) typedef grub_uint32_t grub_minix_uintn_t; #define grub_minix_le_to_cpu_n grub_le_to_cpu32 #else @@ -50,6 +53,13 @@ #endif =20 #define GRUB_MINIX_INODE_BLKSZ(data) sizeof (grub_minix_uintn_t) +#ifdef MODE_MINIX3 +typedef grub_uint32_t grub_minix_ino_t; +#define grub_minix_le_to_cpu_ino grub_le_to_cpu32 +#else +typedef grub_uint16_t grub_minix_ino_t; +#define grub_minix_le_to_cpu_ino grub_le_to_cpu16 +#endif =20 #define GRUB_MINIX_INODE_SIZE(data) (grub_minix_le_to_cpu_n (data->inode= =2Esize)) #define GRUB_MINIX_INODE_MODE(data) (grub_le_to_cpu16 (data->inode.mode)= ) @@ -62,9 +72,28 @@ =20 #define GRUB_MINIX_LOG2_ZONESZ (GRUB_MINIX_LOG2_BSIZE \ + grub_le_to_cpu16 (sblock->log2_zone_size)) -#define GRUB_MINIX_ZONESZ (GRUB_MINIX_BSIZE \ +#define GRUB_MINIX_ZONESZ (data->block_size \ << grub_le_to_cpu16 (sblock->log2_zone_size)) =20 +#ifdef MODE_MINIX3 +struct grub_minix_sblock +{ + grub_uint32_t inode_cnt; + grub_uint16_t zone_cnt; + grub_uint16_t inode_bmap_size; + grub_uint16_t zone_bmap_size; + grub_uint16_t first_data_zone; + grub_uint16_t log2_zone_size; + grub_uint16_t pad; + grub_uint32_t max_file_size; + grub_uint32_t zones; + grub_uint16_t magic; + =20 + grub_uint16_t pad2; + grub_uint16_t block_size; + grub_uint8_t disk_version;=20 +}; +#else struct grub_minix_sblock { grub_uint16_t inode_cnt; @@ -76,8 +105,28 @@ grub_uint32_t max_file_size; grub_uint16_t magic; }; - -#ifndef MODE_MINIX2 +#endif + +#if defined(MODE_MINIX3) + +struct grub_minix_inode +{ + grub_uint16_t mode; + grub_uint16_t nlinks; + grub_uint16_t uid; + grub_uint8_t gid; + grub_uint8_t pad; + grub_uint32_t size; + grub_uint32_t atime; + grub_uint32_t mtime; + grub_uint32_t ctime; + grub_uint32_t dir_zones[7]; + grub_uint32_t indir_zone; + grub_uint32_t double_indir_zone; + grub_uint32_t unused; +}; + +#elif defined(MODE_MINIX2) struct grub_minix_inode { grub_uint16_t mode; @@ -121,6 +170,7 @@ int linknest; grub_disk_t disk; int filename_size; + grub_size_t block_size; }; =20 static grub_dl_t my_mod; @@ -141,18 +191,22 @@ { grub_minix_uintn_t indirn; grub_disk_read (data->disk, +#ifdef MODE_MINIX3 + zone * (data->block_size / GRUB_DISK_SECTOR_SIZE),= +#else zone << GRUB_MINIX_LOG2_ZONESZ, +#endif sizeof (grub_minix_uintn_t) * num, sizeof (grub_minix_uintn_t), (char *) &indirn); return grub_minix_le_to_cpu_n (indirn); } =20 /* Direct block. */ - if (blk < 7) + if (blk < GRUB_MINIX_INODE_DIR_BLOCKS) return GRUB_MINIX_INODE_DIR_ZONES (data, blk); =20 /* Indirect block. */ - blk -=3D 7; + blk -=3D GRUB_MINIX_INODE_DIR_BLOCKS; if (blk < GRUB_MINIX_ZONESZ / GRUB_MINIX_INODE_BLKSZ (data)) { indir =3D grub_get_indir (GRUB_MINIX_INODE_INDIR_ZONE (data), blk)= ; @@ -185,25 +239,27 @@ grub_minix_read_file (struct grub_minix_data *data, void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t sector, unsigned offset, unsigned length), - int pos, grub_disk_addr_t len, char *buf) + grub_off_t pos, grub_disk_addr_t len, char *buf) { struct grub_minix_sblock *sblock =3D &data->sblock; - int i; - int blockcnt; + grub_disk_addr_t i; + grub_disk_addr_t blockcnt; + grub_uint64_t posblock; + grub_uint32_t blockoff; =20 /* Adjust len so it we can't read past the end of the file. */ if (len + pos > GRUB_MINIX_INODE_SIZE (data)) len =3D GRUB_MINIX_INODE_SIZE (data) - pos; =20 - blockcnt =3D (len + pos + GRUB_MINIX_BSIZE - 1) / GRUB_MINIX_BSIZE; + blockcnt =3D grub_divmod64 ((len + pos + data->block_size - 1), + data->block_size, 0); + posblock =3D grub_divmod64 (pos, data->block_size, &blockoff); =20 - for (i =3D pos / GRUB_MINIX_BSIZE; i < blockcnt; i++) + for (i =3D posblock; i < blockcnt; i++) { - int blknr; - int blockoff =3D pos % GRUB_MINIX_BSIZE; - int blockend =3D GRUB_MINIX_BSIZE; - - int skipfirst =3D 0; + grub_disk_addr_t blknr; + grub_uint32_t blockend =3D data->block_size; + grub_off_t skipfirst =3D 0; =20 blknr =3D grub_minix_get_file_block (data, i); if (grub_errno) @@ -212,28 +268,32 @@ /* Last block. */ if (i =3D=3D blockcnt - 1) { - blockend =3D (len + pos) % GRUB_MINIX_BSIZE; + grub_divmod64 (len + pos, data->block_size, &blockend); =20 if (!blockend) - blockend =3D GRUB_MINIX_BSIZE; + blockend =3D data->block_size; } =20 /* First block. */ - if (i =3D=3D (pos / (int) GRUB_MINIX_BSIZE)) + if (i =3D=3D posblock) { skipfirst =3D blockoff; blockend -=3D skipfirst; } =20 data->disk->read_hook =3D read_hook; - grub_disk_read (data->disk, blknr << GRUB_MINIX_LOG2_ZONESZ, + grub_disk_read (data->disk, +#ifdef MODE_MINIX3 + blknr * (sblock->block_size / GRUB_DISK_SECTOR_SIZE), +#else + blknr << GRUB_MINIX_LOG2_ZONESZ, +#endif skipfirst, blockend, buf); - data->disk->read_hook =3D 0; if (grub_errno) return -1; =20 - buf +=3D GRUB_MINIX_BSIZE - skipfirst; + buf +=3D data->block_size - skipfirst; } =20 return len; @@ -248,16 +308,18 @@ struct grub_minix_sblock *sblock =3D &data->sblock; =20 /* Block in which the inode is stored. */ - int block; + grub_disk_addr_t block; data->ino =3D ino; =20 /* The first inode in minix is inode 1. */ ino--; - - block =3D ((2 + grub_le_to_cpu16 (sblock->inode_bmap_size) - + grub_le_to_cpu16 (sblock->zone_bmap_size)) - << GRUB_MINIX_LOG2_BSIZE); - + block =3D (2 + grub_le_to_cpu16 (sblock->inode_bmap_size) + + grub_le_to_cpu16 (sblock->zone_bmap_size)); +#ifndef MODE_MINIX3 + block <<=3D GRUB_MINIX_LOG2_BSIZE; +#else + block *=3D sblock->block_size / GRUB_DISK_SECTOR_SIZE; +#endif block +=3D ino / (GRUB_DISK_SECTOR_SIZE / sizeof (struct grub_minix_in= ode)); int offs =3D (ino % (GRUB_DISK_SECTOR_SIZE / sizeof (struct grub_minix_inode)) @@ -333,7 +395,7 @@ =20 do { - grub_uint16_t ino; + grub_minix_ino_t ino; char filename[data->filename_size + 1]; =20 if (grub_strlen (name) =3D=3D 0) @@ -353,7 +415,7 @@ if (!grub_strcmp (name, filename)) { dirino =3D data->ino; - grub_minix_read_inode (data, grub_le_to_cpu16 (ino)); + grub_minix_read_inode (data, grub_minix_le_to_cpu_ino (ino)); =20 /* Follow the symlink. */ if ((GRUB_MINIX_INODE_MODE (data) @@ -409,20 +471,35 @@ goto fail; =20 if (grub_le_to_cpu16 (data->sblock.magic) =3D=3D GRUB_MINIX_MAGIC) + { +#if !defined(MODE_MINIX3) data->filename_size =3D 14; +#else + data->filename_size =3D 60; +#endif + } +#if !defined(MODE_MINIX3) else if (grub_le_to_cpu16 (data->sblock.magic) =3D=3D GRUB_MINIX_MAGIC= _30) data->filename_size =3D 30; +#endif else goto fail; =20 data->disk =3D disk; data->linknest =3D 0; +#ifdef MODE_MINIX3 + data->block_size =3D grub_le_to_cpu16 (data->sblock.block_size); +#else + data->block_size =3D 1024U; +#endif =20 return data; =20 fail: grub_free (data); -#ifdef MODE_MINIX2 +#if defined(MODE_MINIX3) + grub_error (GRUB_ERR_BAD_FS, "not a minix3 filesystem"); +#elif defined(MODE_MINIX2) grub_error (GRUB_ERR_BAD_FS, "not a minix2 filesystem"); #else grub_error (GRUB_ERR_BAD_FS, "not a minix filesystem"); @@ -458,7 +535,7 @@ =20 while (pos < GRUB_MINIX_INODE_SIZE (data)) { - grub_uint16_t ino; + grub_minix_ino_t ino; char filename[data->filename_size + 1]; int dirino =3D data->ino; struct grub_dirhook_info info; @@ -474,10 +551,13 @@ (char *) filename) < 0) return grub_errno; filename[data->filename_size] =3D '\0'; + if (!ino) + { + pos +=3D sizeof (ino) + data->filename_size; + continue; + } =20 - /* The filetype is not stored in the dirent. Read the inode to - find out the filetype. This *REALLY* sucks. */ - grub_minix_read_inode (data, grub_le_to_cpu16 (ino)); + grub_minix_read_inode (data, grub_minix_le_to_cpu_ino (ino)); info.dir =3D ((GRUB_MINIX_INODE_MODE (data) & GRUB_MINIX_IFDIR) =3D=3D GRUB_MINIX_IFDIR); if (hook (filename, &info) ? 1 : 0) @@ -556,7 +636,9 @@ =0C static struct grub_fs grub_minix_fs =3D { -#ifdef MODE_MINIX2 +#if defined(MODE_MINIX3) + .name =3D "minix3", +#elif defined(MODE_MINIX2) .name =3D "minix2", #else .name =3D "minix", @@ -568,7 +650,9 @@ .next =3D 0 }; =20 -#ifdef MODE_MINIX2 +#if defined(MODE_MINIX3) +GRUB_MOD_INIT(minix3) +#elif defined(MODE_MINIX2) GRUB_MOD_INIT(minix2) #else GRUB_MOD_INIT(minix) @@ -578,7 +662,9 @@ my_mod =3D mod; } =20 -#ifdef MODE_MINIX2 +#if defined(MODE_MINIX3) +GRUB_MOD_FINI(minix3) +#elif defined(MODE_MINIX2) GRUB_MOD_FINI(minix2) #else GRUB_MOD_FINI(minix) =3D=3D=3D added file 'grub-core/fs/minix3.c' --- grub-core/fs/minix3.c 1970-01-01 00:00:00 +0000 +++ grub-core/fs/minix3.c 2011-04-10 15:36:48 +0000 @@ -0,0 +1,2 @@ +#define MODE_MINIX3 1 +#include "minix.c" --------------040703060209030500080100-- --------------enig182F470F883926A4AC014AE9 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAk2h+UgACgkQNak7dOguQgnP4wD/fqXtokTYaZWX9UURi3zXxg92 ylOOwgImIhaDiyTClDAA/361ogrzwIchWM8Lm8WEP/41TBhzReSdW6bhvDY+YSnY =4ZN2 -----END PGP SIGNATURE----- --------------enig182F470F883926A4AC014AE9-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Q95WE-0005Ig-Et for mharc-grub-devel@gnu.org; Sun, 10 Apr 2011 21:02:18 -0400 Received: from [140.186.70.92] (port=36772 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q95WC-0005Ia-Kr for grub-devel@gnu.org; Sun, 10 Apr 2011 21:02:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q95WB-0001kq-DD for grub-devel@gnu.org; Sun, 10 Apr 2011 21:02:16 -0400 Received: from mail-pz0-f41.google.com ([209.85.210.41]:54659) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q95WB-0001kd-3W for grub-devel@gnu.org; Sun, 10 Apr 2011 21:02:15 -0400 Received: by pzk32 with SMTP id 32so2458751pzk.0 for ; Sun, 10 Apr 2011 18:02:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=3wMwIDJFPpCM6LnmrdObHJcFJEeQhW6aDtFbAynKiiU=; b=EP7kSDFoiNZJBgTssmS8HMWwTxq0uhJGK8RlmBoNGc5th+GnaZQg0iyUDpp7bM0VHj i0RJJ7rYIvFM8ayYnmqfeZx9j9s8XQtIxaJkhg014HlNXjA1hSDnCzbZb91MBlUG6vcG LByAtH0JzdASkU2kTNmuRs053FrZ1WjysYIbM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; b=l+df7AVAMY7YR3YCmTRTpLy+R3NKEW6ncC8I6oYnB/xJXcequp7CNCktTVITzBtP/Y tMshNLQUt2Ej5YUIhTbBrv8i15LXfcMSEi7+BlIWRlyeboNZcnuIJ59PoQGwlUVYO93Z TYHb0P4RW4uEqi5eVxIdompFrp2FtYCeo8N6E= Received: by 10.142.208.14 with SMTP id f14mr4523077wfg.183.1302483732084; Sun, 10 Apr 2011 18:02:12 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.66.102 with HTTP; Sun, 10 Apr 2011 18:01:52 -0700 (PDT) In-Reply-To: <4DA1F948.4020506@gmail.com> References: <4DA1F948.4020506@gmail.com> From: Feiran Zheng Date: Mon, 11 Apr 2011 09:01:52 +0800 Message-ID: To: =?UTF-8?Q?Vladimir_=27=CF=86=2Dcoder=2Fphcoder=27_Serbinenko?= Content-Type: text/plain; charset=UTF-8 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.41 Cc: The development of GNU GRUB Subject: Re: [PATCH] MINIX file system version 3 support X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Apr 2011 01:02:17 -0000 > I've cleaned it up. Could you test it and point me as to where I can get > an minix3 image for my own tests? Thank you. This is the download page of minix3 installation image which uses minix3 fs. http://www.minix3.org/download/ And I've also put my VM disk image with default installation (three MINIX3 subpartitions in first primary partition, which are /, /home and /usr) here: http://warm.la/minix.img.bz2 which can be attached to KVM (decompressed) to test. I've tested the patch too, it's doing good. -- Best regards! Fam Zheng From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QI7W9-00032N-OO for mharc-grub-devel@gnu.org; Thu, 05 May 2011 18:59:33 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QI7W7-00032C-Fu for grub-devel@gnu.org; Thu, 05 May 2011 18:59:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QI7W6-0006OR-OY for grub-devel@gnu.org; Thu, 05 May 2011 18:59:31 -0400 Received: from mail-pw0-f41.google.com ([209.85.160.41]:64187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QI7W6-0006OK-Jr for grub-devel@gnu.org; Thu, 05 May 2011 18:59:30 -0400 Received: by pwi10 with SMTP id 10so1690384pwi.0 for ; Thu, 05 May 2011 15:59:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=EKnoVetFMJGMekQYRB9AeXWvVcKZl9RjrlBG21xECHQ=; b=HrPrIIp4mwIqjTrbxbW01FdXkzYnE75w/YrkB1D1XYzBC5RBXXC7/GzyKzJ2eMEE58 qn5M1GWPlF7M822IpmV0Thyu0JcYasL6baV2E8ZJSSZC0yGOXV7wNOWKnOFW4l6KbcBM WyxRfyUKhADvqausEWtGUW000bDcKrn6OMX4Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; b=KUKc9/16tLLvmr9T61CH+ildZ4OD9wM612OLKTV55vvqo0jA+JgMV4eeVbkXWywZlG seaKZYXd4kFQmEo7etAv46MDuerzttPbJIrw2KJWofmw1FzuIi/5C2EwEWoQVdxeIsKt +OIV0/JqwOdsnvbrFfLuPtaQrOYX3xgim88LM= Received: by 10.68.59.225 with SMTP id c1mr2040063pbr.354.1304636369073; Thu, 05 May 2011 15:59:29 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.41.98 with HTTP; Thu, 5 May 2011 15:59:09 -0700 (PDT) In-Reply-To: References: <4DA1F948.4020506@gmail.com> From: Feiran Zheng Date: Fri, 6 May 2011 06:59:09 +0800 Message-ID: Subject: Re: [PATCH] MINIX file system version 3 support To: =?UTF-8?Q?Vladimir_=27=CF=86=2Dcoder=2Fphcoder=27_Serbinenko?= Content-Type: text/plain; charset=UTF-8 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.160.41 Cc: The development of GNU GRUB X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2011 22:59:32 -0000 Hi Vladimir, What's the status of minix3 fs patch now, please? Anything else I can do? >> I've cleaned it up. Could you test it and point me as to where I can get >> an minix3 image for my own tests? -- Best regards! Fam Zheng From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QI7by-000406-GP for mharc-grub-devel@gnu.org; Thu, 05 May 2011 19:05:34 -0400 Received: from eggs.gnu.org ([140.186.70.92]:39979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QI7bv-0003zx-Hx for grub-devel@gnu.org; Thu, 05 May 2011 19:05:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QI7bu-0007LK-AJ for grub-devel@gnu.org; Thu, 05 May 2011 19:05:31 -0400 Received: from mail-wy0-f169.google.com ([74.125.82.169]:63587) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QI7bu-0007LG-5d for grub-devel@gnu.org; Thu, 05 May 2011 19:05:30 -0400 Received: by wyf19 with SMTP id 19so2474584wyf.0 for ; Thu, 05 May 2011 16:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:x-enigmail-version:content-type; bh=SGN4oIJCQi9MS7o5rI3l4xduvQygfdsnXvNxw1diFac=; b=MrSxG4rCvUXQAilt/RsLCYukXZsQ01SagFrB5ARPvVYrbmLhjl9rRLducVKw4wqDn/ qNtObXeOSntg1iw4tNfN4knlNhTsXJvRFHZiZ5Nu8EcRoLsOkbC4Mi+fe8hwdkgDAK+N VjpHm78gZEAMsPZoDkL7scW7mV0yxrl062Dv8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type; b=lZqAzafVK4SVLWpjgD6nqIjrY7+tEANUhpe4I24T2hb/tZOpFXD5gB9Pp0PTIFkM0r +/vs4iBjWiaD9zVH8w1wsWr1F4Atf37pC/CZy2c8JrEHFNMZUZlzadrVAUtpx0OO0v25 Mk58Wo+ftEfG6jGocmaDqRxhmSadNkf5JTQGo= Received: by 10.216.221.206 with SMTP id r56mr1888577wep.28.1304636728940; Thu, 05 May 2011 16:05:28 -0700 (PDT) Received: from debian.x201.phnet (gprs21.swisscom-mobile.ch [193.247.250.21]) by mx.google.com with ESMTPS id o23sm1644741wbc.10.2011.05.05.16.05.26 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 May 2011 16:05:27 -0700 (PDT) Message-ID: <4DC32D2A.6020801@gmail.com> Date: Fri, 06 May 2011 01:05:14 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110402 Iceowl/1.0b2 Icedove/3.1.9 MIME-Version: 1.0 To: Feiran Zheng Subject: Re: [PATCH] MINIX file system version 3 support References: <4DA1F948.4020506@gmail.com> In-Reply-To: X-Enigmail-Version: 1.1.2 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig6E6D2DF91C6199CF978FE444" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.169 Cc: The development of GNU GRUB X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2011 23:05:32 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig6E6D2DF91C6199CF978FE444 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 06.05.2011 00:59, Feiran Zheng wrote: > Hi Vladimir, > > What's the status of minix3 fs patch now, please? Anything else I can d= o? > it's to be applied after 1.99 is released. Does grub compiles and works well under minix? >>> I've cleaned it up. Could you test it and point me as to where I can = get >>> an minix3 image for my own tests? > --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enig6E6D2DF91C6199CF978FE444 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAk3DLTUACgkQNak7dOguQgnKsAD/QBJf+nZ/pGMSj6yncQxrMqzk tx70O7xe79KxwSWkFOcA/27Z2lfJdxijproPXq0I6Ox/Upkl74U9wawn98vA6n4W =tk1T -----END PGP SIGNATURE----- --------------enig6E6D2DF91C6199CF978FE444-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QI84l-0002BT-0v for mharc-grub-devel@gnu.org; Thu, 05 May 2011 19:35:19 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QI84h-00027e-Vj for grub-devel@gnu.org; Thu, 05 May 2011 19:35:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QI84h-0005Qk-3Q for grub-devel@gnu.org; Thu, 05 May 2011 19:35:15 -0400 Received: from mail-pw0-f41.google.com ([209.85.160.41]:64063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QI84g-0005QT-SN for grub-devel@gnu.org; Thu, 05 May 2011 19:35:15 -0400 Received: by pwi10 with SMTP id 10so1705113pwi.0 for ; Thu, 05 May 2011 16:35:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type:content-transfer-encoding; bh=mDiOTtL8v5SdUku+fMVXb6lKjA6GXRp8wde5O3HwLZA=; b=Z/UGSEO3BkZsgj/84K8ka+h7pQFJH3hb0OwYjaKCo6lLPi226VQ0ciUo9DqBzq8jfr l77tFS8RXhJ7bZiQGRIIOLBMn+S//hibGqufnWdBqAkfheJKbVCCTpCPfEjJFwX2R8Ug qaSuoaMdNSYoH1EoWT5vajlspfNN7zTfBv5Xw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=qeXGHRKj5pydpaGDgHkWLFD7m7cu0oxKmeC5rL+S1lbTtV2cgbYoN27SL6dFtvnl2j QxlXkCyhtIgPMfn+QGGFkqYJlreTWh3iVPTBd66glMfOLr7muhd19yVE7+yJVwNVLZg3 YagYlW3nOwfH3SVqmVf0I/5TKm0IDkEk0hq8E= Received: by 10.68.59.225 with SMTP id c1mr2080164pbr.354.1304638514070; Thu, 05 May 2011 16:35:14 -0700 (PDT) MIME-Version: 1.0 Received: by 10.68.41.98 with HTTP; Thu, 5 May 2011 16:34:54 -0700 (PDT) In-Reply-To: <4DC32D2A.6020801@gmail.com> References: <4DA1F948.4020506@gmail.com> <4DC32D2A.6020801@gmail.com> From: Feiran Zheng Date: Fri, 6 May 2011 07:34:54 +0800 Message-ID: Subject: Re: [PATCH] MINIX file system version 3 support To: =?UTF-8?Q?Vladimir_=27=CF=86=2Dcoder=2Fphcoder=27_Serbinenko?= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.160.41 Cc: The development of GNU GRUB X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2011 23:35:16 -0000 2011/5/6 Vladimir '=CF=86-coder/phcoder' Serbinenko : > On 06.05.2011 00:59, Feiran Zheng wrote: >> Hi Vladimir, >> >> What's the status of minix3 fs patch now, please? Anything else I can do= ? >> > it's to be applied after 1.99 is released. Does grub compiles and works > well under minix? OK, thanks. As MINIX has emerged experimental ELF support now, I'm in progress of porting grub. Haven't tried latest trunk yet, I read from wiki it's easier to port pkgsrc version, so I'm trying that one. I have successfully compiled/installed grub from pkgsrc-wip. But grub-probe crashes, I have to debug this before it can do any real work. --=20 Best regards! Fam Zheng From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QI8SJ-00054Y-7b for mharc-grub-devel@gnu.org; Thu, 05 May 2011 19:59:39 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QI8SE-00051p-Is for grub-devel@gnu.org; Thu, 05 May 2011 19:59:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QI8SD-0000Cb-HE for grub-devel@gnu.org; Thu, 05 May 2011 19:59:34 -0400 Received: from mail-wy0-f169.google.com ([74.125.82.169]:45691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QI8SD-0000CJ-AX for grub-devel@gnu.org; Thu, 05 May 2011 19:59:33 -0400 Received: by wyf19 with SMTP id 19so2501368wyf.0 for ; Thu, 05 May 2011 16:59:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:x-enigmail-version:content-type; bh=oeHFhKfAIE8fUyfi1YtAzcghy+L9flSMy0aFU28w/RI=; b=LArs4FTU2uU/xnPw4dhshUY3DW677iNuckLJXUREBkSGPNhQF/mx6zfxvtAxsawk4X xMTz4PM66/jXP0V9re1bYs25nLRkOl705hOv3uQCFDWeINJ5QsA3+JLoemDX9d2ONMkr enzBdhdm5ZFyYAHp4rHF9AEsSkrGK1ZMzk4B8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type; b=XtjbDQjf7Zm7ycPOHiHAKHr4mnqj888+8GzSPmPI1RgJWe5EIVrSa36ymVNe30QI1G 5ULwnpc7ekqJQudgpPrBOz7+mNXhBLafeyWaDgiuS1kZkGlCcHM1knH1DGCKafG94d3V X9VhyvBDZh6CG0WLucOFQm7j4GUQvTzagv83U= Received: by 10.216.230.153 with SMTP id j25mr7002642weq.22.1304639972343; Thu, 05 May 2011 16:59:32 -0700 (PDT) Received: from debian.x201.phnet (gprs21.swisscom-mobile.ch [193.247.250.21]) by mx.google.com with ESMTPS id j49sm1344740wer.38.2011.05.05.16.59.30 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 May 2011 16:59:31 -0700 (PDT) Message-ID: <4DC339E0.1010709@gmail.com> Date: Fri, 06 May 2011 01:59:28 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110402 Iceowl/1.0b2 Icedove/3.1.9 MIME-Version: 1.0 To: Feiran Zheng Subject: Re: [PATCH] MINIX file system version 3 support References: <4DA1F948.4020506@gmail.com> <4DC32D2A.6020801@gmail.com> In-Reply-To: X-Enigmail-Version: 1.1.2 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig08CBA7CB376E3FF8475DF879" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.169 Cc: The development of GNU GRUB X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2011 23:59:38 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig08CBA7CB376E3FF8475DF879 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 06.05.2011 01:34, Feiran Zheng wrote: > 2011/5/6 Vladimir '=CF=86-coder/phcoder' Serbinenko = : >> On 06.05.2011 00:59, Feiran Zheng wrote: >>> Hi Vladimir, >>> >>> What's the status of minix3 fs patch now, please? Anything else I can= do? >>> >> it's to be applied after 1.99 is released. Does grub compiles and work= s >> well under minix? > OK, thanks. > > As MINIX has emerged experimental ELF support now, I'm in progress of > porting grub. > Haven't tried latest trunk yet, I read from wiki it's easier to port > pkgsrc version, so I'm trying that one. > I have successfully compiled/installed grub from pkgsrc-wip. But > grub-probe crashes, I have to debug this before it can do any real > work. Enable executable stack. --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enig08CBA7CB376E3FF8475DF879 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAk3DOeAACgkQNak7dOguQgn1CAD5AZuSNdMI3iSTXpeRFRszABbS 1Nv36N2idD1TRZvXcMUBAIwTWorKoleZR0+7EW0Ep3gFVYaauX+YqD7MHQeHS8uw =xWex -----END PGP SIGNATURE----- --------------enig08CBA7CB376E3FF8475DF879--