kern/142558: Minor updates to fs/msdosfs headers (from NetBSD)

[Pedro F. Giffuni]

The following reply was made to PR kern/142558; it has been noted by GNATS.

From: "Pedro F. Giffuni" <giffunip at tutopia.com>
To: FreeBSD-gnats-submit at FreeBSD.org, freebsd-bugs at FreeBSD.org
Cc:  
Subject: Re: kern/142558: Minor updates to fs/msdosfs headers (from NetBSD)
Date: Sun, 17 Jan 2010 12:39:41 -0800 (PST)

 --0-2114050911-1263760781=:30275
 Content-Type: text/plain; charset=us-ascii
 
 Updated patch:
 
 - In direntry.h remove deExtension, this was always part of the deName
 and some of the code still abuses it. This basically undoes CVS Rev.
 1.46 but fixes the issues more practically.
 - As a consequence to the above winChksum is now exactly as
 in NetBSD.
 
 
       
 --0-2114050911-1263760781=:30275
 Content-Type: application/octet-stream; name=patch-msdosfs
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=patch-msdosfs
 
 ZGlmZiAtcnUgbXNkb3Nmcy5vcmlnL2Jvb3RzZWN0LmggbXNkb3Nmcy9ib290
 c2VjdC5oCi0tLSBtc2Rvc2ZzLm9yaWcvYm9vdHNlY3QuaAkyMDEwLTAxLTA5
 IDE5OjI5OjQ1LjAwMDAwMDAwMCArMDAwMAorKysgbXNkb3Nmcy9ib290c2Vj
 dC5oCTIwMTAtMDEtMTcgMTQ6MTY6MjAuMDAwMDAwMDAwICswMDAwCkBAIC0x
 Niw2ICsxNiw4IEBACiAgKgogICogT2N0b2JlciAxOTkyCiAgKi8KKyNpZm5k
 ZWYgX0ZTX01TRE9TRlNfQk9PVFNFQ1RfSF8KKyNkZWZpbmUJX0ZTX01TRE9T
 RlNfQk9PVFNFQ1RfSF8KIAogLyoKICAqIEZvcm1hdCBvZiBhIGJvb3Qgc2Vj
 dG9yLiAgVGhpcyBpcyB0aGUgZmlyc3Qgc2VjdG9yIG9uIGEgRE9TIGZsb3Bw
 eSBkaXNrCkBAIC05MSwzICs5Myw1IEBACiAjZGVmaW5lCWJzSGlkZGVuU2Vj
 cwlic0JQQi5icGJIaWRkZW5TZWNzCiAjZGVmaW5lCWJzSHVnZVNlY3RvcnMJ
 YnNCUEIuYnBiSHVnZVNlY3RvcnMKICNlbmRpZgorCisjZW5kaWYgLyogIV9G
 U19NU0RPU0ZTX0JPT1RTRUNUX0hfICovCmRpZmYgLXJ1IG1zZG9zZnMub3Jp
 Zy9icGIuaCBtc2Rvc2ZzL2JwYi5oCi0tLSBtc2Rvc2ZzLm9yaWcvYnBiLmgJ
 MjAxMC0wMS0wOSAxOToyOTo0NS4wMDAwMDAwMDAgKzAwMDAKKysrIG1zZG9z
 ZnMvYnBiLmgJMjAxMC0wMS0xNyAxNDoxNjoyNy4wMDAwMDAwMDAgKzAwMDAK
 QEAgLTE3LDYgKzE3LDkgQEAKICAqIE9jdG9iZXIgMTk5MgogICovCiAKKyNp
 Zm5kZWYgX0ZTX01TRE9TRlNfQlBCX0hfCisjZGVmaW5lCV9GU19NU0RPU0ZT
 X0JQQl9IXworCiAvKgogICogQklPUyBQYXJhbWV0ZXIgQmxvY2sgKEJQQikg
 Zm9yIERPUyAzLjMKICAqLwpAQCAtNzgsNyArODEsNyBAQAogCXVfaW50MzJf
 dAlicGJSb290Q2x1c3Q7CS8qIHN0YXJ0IGNsdXN0ZXIgZm9yIHJvb3QgZGly
 ZWN0b3J5ICovCiAJdV9pbnQxNl90CWJwYkZTSW5mbzsJLyogZmlsZXN5c3Rl
 bSBpbmZvIHN0cnVjdHVyZSBzZWN0b3IgKi8KIAl1X2ludDE2X3QJYnBiQmFj
 a3VwOwkvKiBiYWNrdXAgYm9vdCBzZWN0b3IgKi8KLQkvKiBUaGVyZSBpcyBh
 IDEyIGJ5dGUgZmlsbGVyIGhlcmUsIGJ1dCB3ZSBpZ25vcmUgaXQgKi8KKwl1
 X2ludDhfdAlicGJSZXNlcnZlZFsxMl07IC8qIHJlc2VydmVkIGZvciBmdXR1
 cmUgZXhwYW5zaW9uICovCiB9OwogCiAvKgpAQCAtMTUzLDcgKzE1Niw3IEBA
 CiAJdV9pbnQ4X3QgYnBiUm9vdENsdXN0WzRdOwkvKiBzdGFydCBjbHVzdGVy
 IGZvciByb290IGRpcmVjdG9yeSAqLwogCXVfaW50OF90IGJwYkZTSW5mb1sy
 XTsJCS8qIGZpbGVzeXN0ZW0gaW5mbyBzdHJ1Y3R1cmUgc2VjdG9yICovCiAJ
 dV9pbnQ4X3QgYnBiQmFja3VwWzJdOwkJLyogYmFja3VwIGJvb3Qgc2VjdG9y
 ICovCi0JLyogVGhlcmUgaXMgYSAxMiBieXRlIGZpbGxlciBoZXJlLCBidXQg
 d2UgaWdub3JlIGl0ICovCisJdV9pbnQ4X3QgYnBiUmVzZXJ2ZWRbMTJdOwkv
 KiByZXNlcnZlZCBmb3IgZnV0dXJlIGV4cGFuc2lvbiAqLwogfTsKIAogLyoK
 QEAgLTE2OCwzICsxNzEsNCBAQAogCXVfaW50OF90IGZzaWZpbGwyWzEyXTsK
 IAl1X2ludDhfdCBmc2lzaWczWzRdOwogfTsKKyNlbmRpZiAvKiAhX0ZTX01T
 RE9TRlNfQlBCX0hfICovCmRpZmYgLXJ1IG1zZG9zZnMub3JpZy9kaXJlbnRy
 eS5oIG1zZG9zZnMvZGlyZW50cnkuaAotLS0gbXNkb3Nmcy5vcmlnL2RpcmVu
 dHJ5LmgJMjAxMC0wMS0wOSAxOToyOTo0NS4wMDAwMDAwMDAgKzAwMDAKKysr
 IG1zZG9zZnMvZGlyZW50cnkuaAkyMDEwLTAxLTE3IDE1OjAyOjQxLjAwMDAw
 MDAwMCArMDAwMApAQCAtNDcsMTYgKzQ3LDE3IEBACiAgKgogICogT2N0b2Jl
 ciAxOTkyCiAgKi8KKyNpZm5kZWYgX0ZTX01TRE9TRlNfRElSRU5UUllfSF8K
 KyNkZWZpbmUJX0ZTX01TRE9TRlNfRElSRU5UUllfSF8KIAogLyoKICAqIFN0
 cnVjdHVyZSBvZiBhIGRvcyBkaXJlY3RvcnkgZW50cnkuCiAgKi8KIHN0cnVj
 dCBkaXJlbnRyeSB7Ci0JdV9pbnQ4X3QJZGVOYW1lWzhdOwkvKiBmaWxlbmFt
 ZSwgYmxhbmsgZmlsbGVkICovCisJdV9pbnQ4X3QJZGVOYW1lWzExXTsJLyog
 ZmlsZW5hbWUsIGJsYW5rIGZpbGxlZCAqLwogI2RlZmluZQlTTE9UX0VNUFRZ
 CTB4MDAJCS8qIHNsb3QgaGFzIG5ldmVyIGJlZW4gdXNlZCAqLwogI2RlZmlu
 ZQlTTE9UX0U1CQkweDA1CQkvKiB0aGUgcmVhbCB2YWx1ZSBpcyAweGU1ICov
 CiAjZGVmaW5lCVNMT1RfREVMRVRFRAkweGU1CQkvKiBmaWxlIGluIHRoaXMg
 c2xvdCBkZWxldGVkICovCi0JdV9pbnQ4X3QJZGVFeHRlbnNpb25bM107CS8q
 IGV4dGVuc2lvbiwgYmxhbmsgZmlsbGVkICovCiAJdV9pbnQ4X3QJZGVBdHRy
 aWJ1dGVzOwkvKiBmaWxlIGF0dHJpYnV0ZXMgKi8KICNkZWZpbmUJQVRUUl9O
 T1JNQUwJMHgwMAkJLyogbm9ybWFsIGZpbGUgKi8KICNkZWZpbmUJQVRUUl9S
 RUFET05MWQkweDAxCQkvKiBmaWxlIGlzIHJlYWRvbmx5ICovCkBAIC0xNTUs
 NyArMTU2LDggQEAKIAkgICAgaW50IGNoa3N1bSwgc3RydWN0IG1zZG9zZnNt
 b3VudCAqcG1wKTsKIGludAl3aW4ydW5peGZuKHN0cnVjdCBtYm5hbWJ1ZiAq
 bmJwLCBzdHJ1Y3Qgd2luZW50cnkgKndlcCwgaW50IGNoa3N1bSwKIAkgICAg
 c3RydWN0IG1zZG9zZnNtb3VudCAqcG1wKTsKLXVfaW50OF90IHdpbkNoa3N1
 bShzdHJ1Y3QgZGlyZW50cnkgKmRlcCk7Cit1X2ludDhfdCB3aW5DaGtzdW0o
 dV9pbnQ4X3QgKm5hbWUpOwogaW50CXdpblNsb3RDbnQoY29uc3QgdV9jaGFy
 ICp1biwgc2l6ZV90IHVubGVuLCBzdHJ1Y3QgbXNkb3Nmc21vdW50ICpwbXAp
 Owogc2l6ZV90CXdpbkxlbkZpeHVwKGNvbnN0IHVfY2hhciAqdW4sIHNpemVf
 dCB1bmxlbik7CiAjZW5kaWYJLyogX0tFUk5FTCAqLworI2VuZGlmCS8qICFf
 RlNfTVNET1NGU19ESVJFTlRSWV9IXyAqLwpkaWZmIC1ydSBtc2Rvc2ZzLm9y
 aWcvbXNkb3Nmc19jb252LmMgbXNkb3Nmcy9tc2Rvc2ZzX2NvbnYuYwotLS0g
 bXNkb3Nmcy5vcmlnL21zZG9zZnNfY29udi5jCTIwMTAtMDEtMDkgMTk6Mjk6
 NDUuMDAwMDAwMDAwICswMDAwCisrKyBtc2Rvc2ZzL21zZG9zZnNfY29udi5j
 CTIwMTAtMDEtMTcgMTU6MjU6MTAuMDAwMDAwMDAwICswMDAwCkBAIC03NDEs
 MjIgKzc0MSwxMyBAQAogICogQ29tcHV0ZSB0aGUgdW5yb2xsZWQgY2hlY2tz
 dW0gb2YgYSBET1MgZmlsZW5hbWUgZm9yIFdpbjk1IExGTiB1c2UuCiAgKi8K
 IHVfaW50OF90Ci13aW5DaGtzdW0oc3RydWN0IGRpcmVudHJ5ICpkZXApCit3
 aW5DaGtzdW0odV9pbnQ4X3QgKm5hbWUpCiB7CisJaW50IGk7CiAJdV9pbnQ4
 X3QgczsKIAotCXMgPSBkZXAtPmRlTmFtZVswXTsKLQlzID0gKChzIDw8IDcp
 IHwgKHMgPj4gMSkpICsgZGVwLT5kZU5hbWVbMV07Ci0JcyA9ICgocyA8PCA3
 KSB8IChzID4+IDEpKSArIGRlcC0+ZGVOYW1lWzJdOwotCXMgPSAoKHMgPDwg
 NykgfCAocyA+PiAxKSkgKyBkZXAtPmRlTmFtZVszXTsKLQlzID0gKChzIDw8
 IDcpIHwgKHMgPj4gMSkpICsgZGVwLT5kZU5hbWVbNF07Ci0JcyA9ICgocyA8
 PCA3KSB8IChzID4+IDEpKSArIGRlcC0+ZGVOYW1lWzVdOwotCXMgPSAoKHMg
 PDwgNykgfCAocyA+PiAxKSkgKyBkZXAtPmRlTmFtZVs2XTsKLQlzID0gKChz
 IDw8IDcpIHwgKHMgPj4gMSkpICsgZGVwLT5kZU5hbWVbN107Ci0JcyA9ICgo
 cyA8PCA3KSB8IChzID4+IDEpKSArIGRlcC0+ZGVFeHRlbnNpb25bMF07Ci0J
 cyA9ICgocyA8PCA3KSB8IChzID4+IDEpKSArIGRlcC0+ZGVFeHRlbnNpb25b
 MV07Ci0JcyA9ICgocyA8PCA3KSB8IChzID4+IDEpKSArIGRlcC0+ZGVFeHRl
 bnNpb25bMl07Ci0KKwlmb3IgKHMgPSAwLCBpID0gMTE7IC0taSA+PSAwOyBz
 ICs9ICpuYW1lKyspCisJCXMgPSAocyA8PCA3KXwocyA+PiAxKTsKIAlyZXR1
 cm4gKHMpOwogfQogCmRpZmYgLXJ1IG1zZG9zZnMub3JpZy9tc2Rvc2ZzX2xv
 b2t1cC5jIG1zZG9zZnMvbXNkb3Nmc19sb29rdXAuYwotLS0gbXNkb3Nmcy5v
 cmlnL21zZG9zZnNfbG9va3VwLmMJMjAxMC0wMS0wOSAxOToyOTo0NS4wMDAw
 MDAwMDAgKzAwMDAKKysrIG1zZG9zZnMvbXNkb3Nmc19sb29rdXAuYwkyMDEw
 LTAxLTE3IDE1OjA2OjAxLjAwMDAwMDAwMCArMDAwMApAQCAtMjc2LDcgKzI3
 Niw3IEBACiAJCQkJLyoKIAkJCQkgKiBDaGVjayBmb3IgYSBjaGVja3N1bSBv
 ciBuYW1lIG1hdGNoCiAJCQkJICovCi0JCQkJY2hrc3VtX29rID0gKGNoa3N1
 bSA9PSB3aW5DaGtzdW0oZGVwKSk7CisJCQkJY2hrc3VtX29rID0gKGNoa3N1
 bSA9PSB3aW5DaGtzdW0oZGVwLT5kZU5hbWUpKTsKIAkJCQlpZiAoIWNoa3N1
 bV9vawogCQkJCSAgICAmJiAoIW9sZGRvcyB8fCBiY21wKGRvc2ZpbGVuYW1l
 LCBkZXAtPmRlTmFtZSwgMTEpKSkgewogCQkJCQljaGtzdW0gPSAtMTsKQEAg
 LTYxNyw3ICs2MTcsNyBAQAogCSAqIE5vdyB3cml0ZSB0aGUgV2luOTUgbG9u
 ZyBuYW1lCiAJICovCiAJaWYgKGRkZXAtPmRlX2ZuZGNudCA+IDApIHsKLQkJ
 dV9pbnQ4X3QgY2hrc3VtID0gd2luQ2hrc3VtKG5kZXApOworCQl1X2ludDhf
 dCBjaGtzdW0gPSB3aW5DaGtzdW0obmRlcC0+ZGVOYW1lKTsKIAkJY29uc3Qg
 dV9jaGFyICp1biA9IChjb25zdCB1X2NoYXIgKiljbnAtPmNuX25hbWVwdHI7
 CiAJCWludCB1bmxlbiA9IGNucC0+Y25fbmFtZWxlbjsKIAkJaW50IGNudCA9
 IDE7CmRpZmYgLXJ1IG1zZG9zZnMub3JpZy9tc2Rvc2ZzX3Zub3BzLmMgbXNk
 b3Nmcy9tc2Rvc2ZzX3Zub3BzLmMKLS0tIG1zZG9zZnMub3JpZy9tc2Rvc2Zz
 X3Zub3BzLmMJMjAxMC0wMS0wOSAxOToyOTo0NS4wMDAwMDAwMDAgKzAwMDAK
 KysrIG1zZG9zZnMvbXNkb3Nmc192bm9wcy5jCTIwMTAtMDEtMTcgMTU6MDc6
 MjAuMDAwMDAwMDAwICswMDAwCkBAIC0xMjg3LDcgKzEyODcsNyBAQAogCXN0
 cnVjdCBkaXJlbnRyeSBkb3Q7CiAJc3RydWN0IGRpcmVudHJ5IGRvdGRvdDsK
 IH0gZG9zZGlydGVtcGxhdGUgPSB7Ci0JewkiLiAgICAgICAiLCAiICAgIiwJ
 CQkvKiB0aGUgLiBlbnRyeSAqLworCXsJIi4gICAgICAgICAgIiwJCQkJLyog
 dGhlIC4gZW50cnkgKi8KIAkJQVRUUl9ESVJFQ1RPUlksCQkJCS8qIGZpbGUg
 YXR0cmlidXRlICovCiAJCTAsCQkJCQkvKiByZXNlcnZlZCAqLwogCQkwLCB7
 IDAsIDAgfSwgeyAwLCAwIH0sCQkJLyogY3JlYXRlIHRpbWUgJiBkYXRlICov
 CkBAIC0xMjk3LDcgKzEyOTcsNyBAQAogCQl7IDAsIDAgfSwJCQkJLyogc3Rh
 cnRjbHVzdGVyICovCiAJCXsgMCwgMCwgMCwgMCB9CQkJCS8qIGZpbGVzaXpl
 ICovCiAJfSwKLQl7CSIuLiAgICAgICIsICIgICAiLAkJCS8qIHRoZSAuLiBl
 bnRyeSAqLworCXsJIi4uICAgICAgICAgIiwJCQkJLyogdGhlIC4uIGVudHJ5
 ICovCiAJCUFUVFJfRElSRUNUT1JZLAkJCQkvKiBmaWxlIGF0dHJpYnV0ZSAq
 LwogCQkwLAkJCQkJLyogcmVzZXJ2ZWQgKi8KIAkJMCwgeyAwLCAwIH0sIHsg
 MCwgMCB9LAkJCS8qIGNyZWF0ZSB0aW1lICYgZGF0ZSAqLwpAQCAtMTcyOSw3
 ICsxNzI5LDcgQEAKIAkJCX0gZWxzZQogCQkJCWRpcmJ1Zi5kX2ZpbGVubyA9
 ICh1aW50MzJfdClmaWxlbm87CiAKLQkJCWlmIChjaGtzdW0gIT0gd2luQ2hr
 c3VtKGRlbnRwKSkgeworCQkJaWYgKGNoa3N1bSAhPSB3aW5DaGtzdW0oZGVu
 dHAtPmRlTmFtZSkpIHsKIAkJCQlkaXJidWYuZF9uYW1sZW4gPSBkb3MydW5p
 eGZuKGRlbnRwLT5kZU5hbWUsCiAJCQkJICAgICh1X2NoYXIgKilkaXJidWYu
 ZF9uYW1lLAogCQkJCSAgICBkZW50cC0+ZGVMb3dlckNhc2UgfAo=
 
 --0-2114050911-1263760781=:30275--