Date: Wed, 18 Jul 2007 08:20:31 GMT From: Brian Chu <chub@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 123680 for review Message-ID: <200707180820.l6I8KVJI066090@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=123680 Change 123680 by chub@chub-msdosfs on 2007/07/18 08:19:38 Few msdosfs compiling fixes that should've been caught earlier. Eliminating ifndef/define/endif protection. Affected files ... .. //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/bootsect.h#5 edit .. //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/msdosfs_vfsops.c#4 edit .. //depot/projects/soc2007/chub-msdosfs2/sys/geom/label/g_label_msdosfs.c#6 edit Differences ... ==== //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/bootsect.h#5 (text+ko) ==== @@ -1,9 +1,6 @@ /* $FreeBSD: src/sys/fs/msdosfs/bootsect.h,v 1.13 2005/09/29 14:09:46 peadar Exp $ */ /* $NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $ */ -#ifndef _FS_MSDOSFS_BOOTSECT_H -#define _FS_MSDOSFS_BOOTSECT_H - /*- * Written by Paul Popelka (paulp@uts.amdahl.com) * @@ -20,8 +17,6 @@ * October 1992 */ -#include <fs/msdosfs/bpb.h> - /* * Format of a boot sector. This is the first sector on a DOS floppy disk * or the fist sector of a partition on a hard disk. But, it is not the @@ -88,6 +83,3 @@ struct bootsector50 bs50; struct bootsector710 bs710; }; - -#endif -// _FS_MSDOSFS_BOOTSECT_H ==== //depot/projects/soc2007/chub-msdosfs2/sys/fs/msdosfs/msdosfs_vfsops.c#4 (text+ko) ==== @@ -428,9 +428,9 @@ goto error_exit; bp->b_flags |= B_AGE; bsp = (union bootsector *)bp->b_data; - b33 = (struct byte_bpb33 *)bsp->bs33.bsBPB; - b50 = (struct byte_bpb50 *)bsp->bs50.bsBPB; - b710 = (struct byte_bpb710 *)bsp->bs710.bsBPB; + b33 = (struct byte_bpb33 *)&bsp->bs33.bsBPB; + b50 = (struct byte_bpb50 *)&bsp->bs50.bsBPB; + b710 = (struct byte_bpb710 *)&bsp->bs710.bsBPB; #ifndef MSDOSFS_NOCHECKSIG if (bsp->bs50.bsBootSectSig0 != BOOTSIG0 ==== //depot/projects/soc2007/chub-msdosfs2/sys/geom/label/g_label_msdosfs.c#6 (text+ko) ==== @@ -34,8 +34,8 @@ #include <sys/kernel.h> #include <sys/malloc.h> +#include <fs/msdosfs/bpb.h> #include <fs/msdosfs/bootsect.h> -#include <fs/msdosfs/bpb.h> #include <fs/msdosfs/direntry.h> #include <geom/geom.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707180820.l6I8KVJI066090>