From owner-p4-projects@FreeBSD.ORG Wed Jul 18 08:20:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4348416A405; Wed, 18 Jul 2007 08:20:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F206216A402 for ; Wed, 18 Jul 2007 08:20:31 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E37C213C4A3 for ; Wed, 18 Jul 2007 08:20:31 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6I8KVpx066096 for ; Wed, 18 Jul 2007 08:20:31 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6I8KVJI066090 for perforce@freebsd.org; Wed, 18 Jul 2007 08:20:31 GMT (envelope-from chub@FreeBSD.org) Date: Wed, 18 Jul 2007 08:20:31 GMT Message-Id: <200707180820.l6I8KVJI066090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 123680 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2007 08:20:32 -0000 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 - /* * 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 #include +#include #include -#include #include #include