Date: Tue, 5 Dec 2000 06:25:16 -0600 From: Larry Rosenman <ler@lerctr.org> To: Alfred Perlstein <alfred@FreeBSD.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.bin/fstat fstat.c cd9660.c src/sys/sys mount.h Message-ID: <20001205062516.A5086@lerami.lerctr.org> In-Reply-To: <20001205042214.O8051@fw.wintelcom.net>; from alfred@FreeBSD.org on Tue, Dec 05, 2000 at 04:22:14AM -0800 References: <200012050943.eB59hDn23446@freefall.freebsd.org> <20001205061320.A4269@lerami.lerctr.org> <20001205042214.O8051@fw.wintelcom.net>
next in thread | previous in thread | raw e-mail | index | archive | help
* Alfred Perlstein <alfred@FreeBSD.org> [001205 06:22]: > * Larry Rosenman <ler@lerctr.org> [001205 04:13] wrote: > > * Alfred Perlstein <alfred@FreeBSD.org> [001205 03:43]: > > > alfred 2000/12/05 01:43:12 PST > > > > > > Modified files: (Branch: RELENG_4) > > > usr.bin/fstat fstat.c cd9660.c > > > sys/sys mount.h > > > Log: > > > MFC: remove struct mount from userland (except fstat) to prevent namespace > > > pollution. > > > > > > Revision Changes Path > > > 1.21.2.3 +2 -2 src/usr.bin/fstat/fstat.c > > > 1.1.2.2 +3 -1 src/usr.bin/fstat/cd9660.c > > > 1.89.2.1 +5 -1 src/sys/sys/mount.h > > > > > > > > > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > > > with "unsubscribe cvs-all" in the body of the message > > > > > And make world breaks... > > > > Looks to me like /usr/src/sys/sys/isofs/cd9660/cd9660_node.h needs to > > #include <sys/lock.h> > > It really shouldn't have, make sure you have the most up to date > version of each of these files. > > field i_lock is a 'struct lock' however sys/lock.h should have > already been included by the #define _KERNEL and #include sys/mount.h > right above it. > > I can't reproduce this, can you double check that you have the most > up to date version of src/usr.bin/fstat/cd9660.c ? It's what cvsup gave me... /* * Copyright (c) 2000 Peter Edwards * Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by Peter Edwards * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD: src/usr.bin/fstat/cd9660.c,v 1.1.2.1 2000/07/02 10:20:24 ps Exp $ */ /* * XXX - * This had to be separated from fstat.c because cd9660s has namespace * conflicts with UFS. */ #include <sys/param.h> #include <sys/stat.h> #include <sys/time.h> #include <sys/vnode.h> #include <sys/mount.h> #include <isofs/cd9660/cd9660_node.h> #include <kvm.h> #include <stdio.h> #include "fstat.h" int isofs_filestat(vp, fsp) struct vnode *vp; struct filestat *fsp; { struct iso_node isonode; if (!KVM_READ(VTOI(vp), &isonode, sizeof (isonode))) { dprintf(stderr, "can't read iso_node at %p for pid %d\n", (void *)VTOI(vp), Pid); return 0; } fsp->fsid = dev2udev(isonode.i_dev) & 0xffff; fsp->mode = (mode_t)isonode.inode.iso_mode; fsp->rdev = isonode.i_dev; fsp->fileid = (long)isonode.i_number; fsp->size = (u_long)isonode.i_size; return 1; } > > -- > -Alfred Perlstein - [bright@wintelcom.net|alfred@freebsd.org] > "I have the heart of a child; I keep it in a jar on my desk." -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 972-414-9812 E-Mail: ler@lerctr.org US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001205062516.A5086>