Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In cd9660_mount, initialize imp to VFSTOISOFS(mp) instead of NULL. 

Remove redundant assignments to imp.  This fixes the page fault
panic when the kernel mounts an ISO9660 filesystem, introduced at
revision 1.27.
This commit is contained in:
dyoung 2005-09-30 08:15:46 +00:00
parent 3d17d70f0c
commit 3d52cdeb53
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/fs/cd9660/cd9660_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_vfsops.c,v 1.27 2005/09/23 12:10:32 jmmv Exp $ */
/* $NetBSD: cd9660_vfsops.c,v 1.28 2005/09/30 08:15:46 dyoung Exp $ */
/*-
* Copyright (c) 1994
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.27 2005/09/23 12:10:32 jmmv Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.28 2005/09/30 08:15:46 dyoung Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -169,10 +169,9 @@ cd9660_mount(mp, path, data, ndp, p)
struct vnode *devvp;
struct iso_args args;
int error;
struct iso_mnt *imp = NULL;
struct iso_mnt *imp = VFSTOISOFS(mp);
if (mp->mnt_flag & MNT_GETARGS) {
imp = VFSTOISOFS(mp);
if (imp == NULL)
return EIO;
args.fspec = NULL;
@ -248,7 +247,6 @@ cd9660_mount(mp, path, data, ndp, p)
if (devvp != imp->im_devvp)
return (EINVAL); /* needs translation */
}
imp = VFSTOISOFS(mp);
return set_statvfs_info(path, UIO_USERSPACE, args.fspec, UIO_USERSPACE,
mp, p);