[parisc-linux-cvs] linux-2.4 varenet

[Thibaut VARENE]

On Fri, 30 Jul 2004 09:50:33 -0600 (MDT)
varenet at parisc-linux.org (Thibaut Varene) wrote:

> CVSROOT:	/var/cvs
> Module name:	linux-2.4
> Changes by:	varenet	04/07/30 09:50:32
> 
> Modified files:
> 	.              : Makefile 
> 	arch/parisc/kernel: sys_parisc32.c 
> 
> Log message:
> hacking the checkroot.sh breakage on 64bit, will have to be fixed.
> patch submitted by Joel Soete <soete.joel at tiscali.be>
> 

===================================================================
RCS file: /var/cvs/linux-2.4/arch/parisc/kernel/sys_parisc32.c,v
retrieving revision 1.30
diff -u -p -r1.30 sys_parisc32.c
--- sys_parisc32.c      1 Sep 2003 17:17:48 -0000       1.30
+++ sys_parisc32.c      30 Jul 2004 15:46:21 -0000
@@ -1195,13 +1195,14 @@ asmlinkage int sys32_mount(char *dev_nam
        if (err)
                goto out;
 
-       if (!type_page) {
-               err = -EINVAL;
-               goto out;
+       /* FIXME: this is a ugly HACK to prevent checkroot.sh fsckage.
+          FWIW, sparc does the same. */
+       if (type_page) {
+               is_smb = !strcmp((char *)type_page, SMBFS_NAME);
+               is_ncp = !strcmp((char *)type_page, NCPFS_NAME);
+       } else {
+               is_smb = is_ncp = 0;
        }
-
-       is_smb = !strcmp((char *)type_page, SMBFS_NAME);
-       is_ncp = !strcmp((char *)type_page, NCPFS_NAME);
 
        err = copy_mount_stuff_to_kernel((const void *)(unsigned
long)data, & a_page);
        if (err)