Date: Thu, 19 Mar 2015 20:49:33 -0700 From: Chris Torek <chris.torek@gmail.com> To: freebsd-fs@freebsd.org Subject: leftovers in fs/msdosfs/msdosfsmount.h Message-ID: <CAPx1GvfTSdYp0spJ6a3ZHjWnJsDhDmrXQDN4_J2BAysv1XwV5Q@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--001a11c3bcbc526b3f0511b03436
Content-Type: text/plain; charset=UTF-8
I was poking at the kernel-side msdosfs code for reasons too boring :-) to
go into here and found some stuff that should be safe to remove, based on
the fact that there are no references to these names anywhere in the rest
of the entire source tree.
I've built a kernel with this patch in it (as a double check) but have not
tested it on anything else. I don't really care if it goes in or not, I'm
just providing it since I got misled slightly (in terms of how the UTF-16
en- and de-coding was to be done) when I was looking at the header.
(In case gmail eats the straight text patch below, it's here as an
attachment too. I'd send from a better mail system but my regular home
FreeBSD system is still not quite up yet...)
(A more interesting question is: when can the old compat mount stuff go
away?)
Chris
commit 591612326e9c7ae2f12ad7d215a15cbefae0ff9a
Author: Chris Torek <chris.torek@gmail.com>
Date: Thu Mar 19 19:30:02 2015 -0700
msdosfs: mark unused compat-mount fields
The magic number MSDOSFS_ARGSMAGIC, which used to distinguish
"old" vs "new" msdosfs mount arguments, has not been used since
2005; it should just go away now.
Likewise, the local-to-Unicode table that changed at the same
time is unused.
Leave the space reserved in the old style mount arguments, though,
since we still support the old mount call (via the cmount entry
point).
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 10ed95b..9446a3e 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -239,8 +239,8 @@ struct msdosfs_args {
gid_t gid; /* gid that owns msdosfs files */
mode_t mask; /* file mask to be applied for msdosfs
perms */
int flags; /* see below */
- int magic; /* version number */
- u_int16_t u2w[128]; /* Local->Unicode table */
+ int unused1; /* unused, was version number */
+ u_int16_t unused2[128]; /* no longer used, was Local->Unicode table
*/
char *cs_win; /* Windows(Unicode) Charset */
char *cs_dos; /* DOS Charset */
char *cs_local; /* Local Charset */
@@ -264,6 +264,4 @@ struct msdosfs_args {
#define MSDOSFS_LARGEFS 0x10000000 /* perform fileno
mapping */
#define MSDOSFS_FSIMOD 0x01000000
-#define MSDOSFS_ARGSMAGIC 0xe4eff300
-
#endif /* !_MSDOSFS_MSDOSFSMOUNT_H_ */
--001a11c3bcbc526b3f0511b03436
Content-Type: application/octet-stream; name="msdosfsmount.h.patch"
Content-Disposition: attachment; filename="msdosfsmount.h.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_i7h1l5g40
Y29tbWl0IDU5MTYxMjMyNmU5YzdhZTJmMTJhZDdkMjE1YTE1Y2JlZmFlMGZmOWEKQXV0aG9yOiBD
aHJpcyBUb3JlayA8Y2hyaXMudG9yZWtAZ21haWwuY29tPgpEYXRlOiAgIFRodSBNYXIgMTkgMTk6
MzA6MDIgMjAxNSAtMDcwMAoKICAgIG1zZG9zZnM6IG1hcmsgdW51c2VkIGNvbXBhdC1tb3VudCBm
aWVsZHMKICAgIAogICAgVGhlIG1hZ2ljIG51bWJlciBNU0RPU0ZTX0FSR1NNQUdJQywgd2hpY2gg
dXNlZCB0byBkaXN0aW5ndWlzaAogICAgIm9sZCIgdnMgIm5ldyIgbXNkb3NmcyBtb3VudCBhcmd1
bWVudHMsIGhhcyBub3QgYmVlbiB1c2VkIHNpbmNlCiAgICAyMDA1OyBpdCBzaG91bGQganVzdCBn
byBhd2F5IG5vdy4KICAgIAogICAgTGlrZXdpc2UsIHRoZSBsb2NhbC10by1Vbmljb2RlIHRhYmxl
IHRoYXQgY2hhbmdlZCBhdCB0aGUgc2FtZQogICAgdGltZSBpcyB1bnVzZWQuCiAgICAKICAgIExl
YXZlIHRoZSBzcGFjZSByZXNlcnZlZCBpbiB0aGUgb2xkIHN0eWxlIG1vdW50IGFyZ3VtZW50cywg
dGhvdWdoLAogICAgc2luY2Ugd2Ugc3RpbGwgc3VwcG9ydCB0aGUgb2xkIG1vdW50IGNhbGwgKHZp
YSB0aGUgY21vdW50IGVudHJ5CiAgICBwb2ludCkuCgpkaWZmIC0tZ2l0IGEvc3lzL2ZzL21zZG9z
ZnMvbXNkb3Nmc21vdW50LmggYi9zeXMvZnMvbXNkb3Nmcy9tc2Rvc2ZzbW91bnQuaAppbmRleCAx
MGVkOTViLi45NDQ2YTNlIDEwMDY0NAotLS0gYS9zeXMvZnMvbXNkb3Nmcy9tc2Rvc2ZzbW91bnQu
aAorKysgYi9zeXMvZnMvbXNkb3Nmcy9tc2Rvc2ZzbW91bnQuaApAQCAtMjM5LDggKzIzOSw4IEBA
IHN0cnVjdCBtc2Rvc2ZzX2FyZ3MgewogCWdpZF90CWdpZDsJCS8qIGdpZCB0aGF0IG93bnMgbXNk
b3NmcyBmaWxlcyAqLwogCW1vZGVfdAltYXNrOwkJLyogZmlsZSBtYXNrIHRvIGJlIGFwcGxpZWQg
Zm9yIG1zZG9zZnMgcGVybXMgKi8KIAlpbnQJZmxhZ3M7CQkvKiBzZWUgYmVsb3cgKi8KLQlpbnQg
bWFnaWM7CQkvKiB2ZXJzaW9uIG51bWJlciAqLwotCXVfaW50MTZfdCB1MndbMTI4XTsgICAgIC8q
IExvY2FsLT5Vbmljb2RlIHRhYmxlICovCisJaW50CXVudXNlZDE7CS8qIHVudXNlZCwgd2FzIHZl
cnNpb24gbnVtYmVyICovCisJdV9pbnQxNl90IHVudXNlZDJbMTI4XTsJLyogbm8gbG9uZ2VyIHVz
ZWQsIHdhcyBMb2NhbC0+VW5pY29kZSB0YWJsZSAqLwogCWNoYXIJKmNzX3dpbjsJLyogV2luZG93
cyhVbmljb2RlKSBDaGFyc2V0ICovCiAJY2hhcgkqY3NfZG9zOwkvKiBET1MgQ2hhcnNldCAqLwog
CWNoYXIJKmNzX2xvY2FsOwkvKiBMb2NhbCBDaGFyc2V0ICovCkBAIC0yNjQsNiArMjY0LDQgQEAg
c3RydWN0IG1zZG9zZnNfYXJncyB7CiAjZGVmaW5lCU1TRE9TRlNfTEFSR0VGUwkJMHgxMDAwMDAw
MAkvKiBwZXJmb3JtIGZpbGVubyBtYXBwaW5nICovCiAjZGVmaW5lCU1TRE9TRlNfRlNJTU9ECQkw
eDAxMDAwMDAwCiAKLSNkZWZpbmUgTVNET1NGU19BUkdTTUFHSUMJMHhlNGVmZjMwMAotCiAjZW5k
aWYgLyogIV9NU0RPU0ZTX01TRE9TRlNNT1VOVF9IXyAqLwo=
--001a11c3bcbc526b3f0511b03436--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPx1GvfTSdYp0spJ6a3ZHjWnJsDhDmrXQDN4_J2BAysv1XwV5Q>