[src/netbsd-9]: src/sys/fs/msdosfs Pull up following revision(s) (requested b...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ade5a1e2b7d8
branches:  netbsd-9
changeset: 951995:ade5a1e2b7d8
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Feb 11 12:58:29 2021 +0000

description:
Pull up following revision(s) (requested by ryoon in ticket #1204):

        sys/fs/msdosfs/msdosfs_vfsops.c: revision 1.136

Enable to mount Raspberry Pi Pico's USB mass storage partition
Fix PR kern/55985.

O.k. by thorpej@.
Pull-up to netbsd-8 and netbsd-9.

diffstat:

 sys/fs/msdosfs/msdosfs_vfsops.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r b9b767bfc28f -r ade5a1e2b7d8 sys/fs/msdosfs/msdosfs_vfsops.c
--- a/sys/fs/msdosfs/msdosfs_vfsops.c   Thu Feb 11 12:53:28 2021 +0000
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c   Thu Feb 11 12:58:29 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msdosfs_vfsops.c,v 1.130 2018/09/03 16:29:34 riastradh Exp $   */
+/*     $NetBSD: msdosfs_vfsops.c,v 1.130.4.1 2021/02/11 12:58:29 martin Exp $  */
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.130 2018/09/03 16:29:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.130.4.1 2021/02/11 12:58:29 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -518,6 +518,13 @@
        b50 = (struct byte_bpb50 *)bsp->bs50.bsBPB;
        b710 = (struct byte_bpb710 *)bsp->bs710.bsBPB;
 
+#if 0
+       /*
+        * Some FAT partition, for example Raspberry Pi Pico's
+        * USB mass storage, does not have exptected BOOTSIGs.
+        * According to FreeBSD's comment, some PC-9800/9821
+        * FAT floppy disks have similar problems.
+        */
        if (!(argp->flags & MSDOSFSMNT_GEMDOSFS)) {
                if (bsp->bs50.bsBootSectSig0 != BOOTSIG0
                    || bsp->bs50.bsBootSectSig1 != BOOTSIG1) {
@@ -528,6 +535,7 @@
                        goto error_exit;
                }
        }
+#endif
 
        pmp = malloc(sizeof(*pmp), M_MSDOSFSMNT, M_WAITOK|M_ZERO);
        pmp->pm_mountp = mp;