From 08c23b9964335aabf025450cb4a454584ec13ed6 Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Thu, 5 Feb 2004 21:03:37 +0000 Subject: [PATCH] __FreeBSD__ -> __DragonFly__ --- sys/vfs/gnu/ext2fs/ext2_fs.h | 6 ++--- sys/vfs/hpfs/hpfs.h | 7 ++---- sys/vfs/hpfs/hpfs_vfsops.c | 38 ++++++++++++++++---------------- sys/vfs/hpfs/hpfs_vnops.c | 28 +++++++++++------------ sys/vfs/msdosfs/msdosfs_vfsops.c | 20 ++++++++--------- sys/vfs/msdosfs/msdosfsmount.h | 4 ++-- sys/vfs/ntfs/ntfs_inode.h | 6 ++--- sys/vfs/ntfs/ntfs_subr.c | 8 +++---- sys/vfs/ntfs/ntfs_vfsops.c | 38 ++++++++++++++++---------------- sys/vfs/ntfs/ntfs_vnops.c | 22 +++++++++--------- 10 files changed, 87 insertions(+), 90 deletions(-) diff --git a/sys/vfs/gnu/ext2fs/ext2_fs.h b/sys/vfs/gnu/ext2fs/ext2_fs.h index cdcdb2b9df..0eaaede7af 100644 --- a/sys/vfs/gnu/ext2fs/ext2_fs.h +++ b/sys/vfs/gnu/ext2fs/ext2_fs.h @@ -5,7 +5,7 @@ * University of Utah, Department of Computer Science * * $FreeBSD: src/sys/gnu/ext2fs/ext2_fs.h,v 1.8.2.2 2001/09/29 12:52:47 iedowse Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_fs.h,v 1.3 2003/08/07 21:17:41 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_fs.h,v 1.4 2004/02/05 21:03:37 rob Exp $ */ /* * linux/include/linux/ext2_fs.h @@ -122,7 +122,7 @@ #define EXT2_MIN_BLOCK_SIZE 1024 #define EXT2_MAX_BLOCK_SIZE 4096 #define EXT2_MIN_BLOCK_LOG_SIZE 10 -#if defined(__KERNEL__) || (defined(__FreeBSD__) && defined(_KERNEL)) +#if defined(__KERNEL__) || (defined(__DragonFly__) && defined(_KERNEL)) # define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize) #else # define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size) @@ -164,7 +164,7 @@ # define EXT2_FRAG_SIZE(s) ((s)->u.ext2_sb.s_frag_size) # define EXT2_FRAGS_PER_BLOCK(s) ((s)->u.ext2_sb.s_frags_per_block) #else -# if defined(_KERNEL) && defined(__FreeBSD__) +# if defined(_KERNEL) && defined(__DragonFly__) # define EXT2_FRAG_SIZE(s) ((s)->s_frag_size) # else # define EXT2_FRAG_SIZE(s) (EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size) diff --git a/sys/vfs/hpfs/hpfs.h b/sys/vfs/hpfs/hpfs.h index 9de5f4dd40..fc10b0bd16 100644 --- a/sys/vfs/hpfs/hpfs.h +++ b/sys/vfs/hpfs/hpfs.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs.h,v 1.1 1999/12/09 19:09:58 semenu Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs.h,v 1.8 2003/11/15 21:05:44 dillon Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs.h,v 1.9 2004/02/05 21:03:37 rob Exp $ */ /*#define HPFS_DEBUG 10*/ @@ -378,11 +378,8 @@ struct hpfid { #define dprintf(a) #define ddprintf(a) #endif - -#if __FreeBSD_version >= 300000 MALLOC_DECLARE(M_HPFSMNT); MALLOC_DECLARE(M_HPFSNO); -#endif #define VFSTOHPFS(mp) ((struct hpfsmount *)((mp)->mnt_data)) #define VTOHP(v) ((struct hpfsnode *)((v)->v_data)) #define HPTOV(h) ((struct vnode *)((h)->h_vp)) @@ -400,7 +397,7 @@ typedef int (vop_t) (void *); #define VGET(a, b, c) vget((a), LK_EXCLUSIVE) #define VN_LOCK(a, b, c) vn_lock((a), LK_EXCLUSIVE) #define LOCKMGR(a, b, c, d) lockmgr((a), (b), (c)) -#else /* defined(__FreeBSD__) */ +#else /* defined(__DragonFly__) */ #define HASHINIT(a, b, c, d) hashinit((a), (b), (d)) #define VOP__LOCK(a, b, c) VOP_LOCK((a), (b), (c)) #define VOP__UNLOCK(a, b, c) VOP_UNLOCK((a), (b), (c)) diff --git a/sys/vfs/hpfs/hpfs_vfsops.c b/sys/vfs/hpfs/hpfs_vfsops.c index 3a305d2108..4c45dfc43f 100644 --- a/sys/vfs/hpfs/hpfs_vfsops.c +++ b/sys/vfs/hpfs/hpfs_vfsops.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.3.2.2 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.11 2003/10/19 21:24:55 hmp Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.12 2004/02/05 21:03:37 rob Exp $ */ @@ -58,7 +58,7 @@ #include "hpfsmount.h" #include "hpfs_subr.h" -#if defined(__FreeBSD__) +#if defined(__DragonFly__) MALLOC_DEFINE(M_HPFSMNT, "HPFS mount", "HPFS mount structure"); MALLOC_DEFINE(M_HPFSNO, "HPFS node", "HPFS node structure"); #endif @@ -75,7 +75,7 @@ static int hpfs_vptofh (struct vnode *, struct fid *); static int hpfs_fhtovp (struct mount *, struct fid *, struct vnode **); -#if !defined(__FreeBSD__) +#if !defined(__DragonFly__) static int hpfs_quotactl (struct mount *, int, uid_t, caddr_t, struct proc *); static int hpfs_start (struct mount *, int, struct proc *); @@ -83,7 +83,7 @@ static int hpfs_sync (struct mount *, int, struct ucred *, struct proc *); #endif -#if defined(__FreeBSD__) +#if defined(__DragonFly__) struct sockaddr; static int hpfs_mount (struct mount *, char *, caddr_t, struct nameidata *, struct thread *); @@ -104,7 +104,7 @@ static int hpfs_checkexp (struct mount *, struct mbuf *, /*ARGSUSED*/ static int hpfs_checkexp(mp, nam, exflagsp, credanonp) -#if defined(__FreeBSD__) +#if defined(__DragonFly__) struct mount *mp; struct sockaddr *nam; int *exflagsp; @@ -131,7 +131,7 @@ hpfs_checkexp(mp, nam, exflagsp, credanonp) return (0); } -#if !defined(__FreeBSD__) +#if !defined(__DragonFly__) /*ARGSUSED*/ static int hpfs_sysctl(name, namelen, oldp, oldlenp, newp, newlen, td) @@ -153,7 +153,7 @@ hpfs_mountroot() } #endif -#if defined(__FreeBSD__) +#if defined(__DragonFly__) static int hpfs_init ( struct vfsconf *vcp ) @@ -165,7 +165,7 @@ hpfs_init () dprintf(("hpfs_init():\n")); hpfs_hphashinit(); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) return 0; #endif } @@ -173,7 +173,7 @@ hpfs_init () static int hpfs_mount ( struct mount *mp, -#if defined(__FreeBSD__) +#if defined(__DragonFly__) char *path, caddr_t data, #else /* defined(__NetBSD__) */ @@ -239,7 +239,7 @@ hpfs_mount ( devvp = ndp->ni_vp; -#if defined(__FreeBSD__) +#if defined(__DragonFly__) if (!vn_isdisk(devvp, &err)) goto error_2; #else /* defined(__NetBSD__) */ @@ -334,14 +334,14 @@ hpfs_mountfs(devvp, mp, argsp, td) if (error) return (error); ncount = vcount(devvp); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) if (devvp->v_object) ncount -= 1; #endif if (ncount > 1 && devvp != rootvp) return (EBUSY); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) VN_LOCK(devvp, LK_EXCLUSIVE | LK_RETRY, td); error = vinvalbuf(devvp, V_SAVE, td, 0, 0); VOP__UNLOCK(devvp, 0, td); @@ -420,7 +420,7 @@ hpfs_mountfs(devvp, mp, argsp, td) vput(vp); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) mp->mnt_stat.f_fsid.val[0] = (long)dev2udev(dev); mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; #else @@ -436,7 +436,7 @@ failed: if (bp) brelse (bp); mp->mnt_data = (qaddr_t)NULL; -#if defined(__FreeBSD__) +#if defined(__DragonFly__) devvp->v_specmountpoint = NULL; #else devvp->v_specflags &= ~SI_MOUNTEDON; @@ -445,7 +445,7 @@ failed: return (error); } -#if !defined(__FreeBSD__) +#if !defined(__DragonFly__) static int hpfs_start ( struct mount *mp, @@ -481,7 +481,7 @@ hpfs_unmount( return (error); } -#if defined(__FreeBSD__) +#if defined(__DragonFly__) hpmp->hpm_devvp->v_specmountpoint = NULL; #else hpmp->hpm_devvp->v_specflags &= ~SI_MOUNTEDON; @@ -531,7 +531,7 @@ hpfs_statfs( dprintf(("hpfs_statfs(): HPFS%d.%d\n", hpmp->hpm_su.su_hpfsver, hpmp->hpm_su.su_fnctver)); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) sbp->f_type = mp->mnt_vfc->vfc_typenum; #else /* defined(__NetBSD__) */ sbp->f_type = 0; @@ -553,7 +553,7 @@ hpfs_statfs( return (0); } -#if !defined(__FreeBSD__) +#if !defined(__DragonFly__) static int hpfs_sync ( struct mount *mp, @@ -723,7 +723,7 @@ hpfs_vget( return (0); } -#if defined(__FreeBSD__) +#if defined(__DragonFly__) static struct vfsops hpfs_vfsops = { hpfs_mount, vfs_stdstart, diff --git a/sys/vfs/hpfs/hpfs_vnops.c b/sys/vfs/hpfs/hpfs_vnops.c index 8e66b6da83..2cdb9033ee 100644 --- a/sys/vfs/hpfs/hpfs_vnops.c +++ b/sys/vfs/hpfs/hpfs_vnops.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.2.2.2 2002/01/15 18:35:09 semenu Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.11 2003/10/09 22:27:23 dillon Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.12 2004/02/05 21:03:37 rob Exp $ */ #include @@ -43,20 +43,20 @@ #include #include -#if !defined(__FreeBSD__) +#if !defined(__DragonFly__) #include #endif #include #include #include #include -#if defined(__FreeBSD__) +#if defined(__DragonFly__) #include #endif #include #include -#if !defined(__FreeBSD__) +#if !defined(__DragonFly__) #include #include #endif @@ -87,14 +87,14 @@ static int hpfs_lookup (struct vop_lookup_args *ap); static int hpfs_create (struct vop_create_args *); static int hpfs_remove (struct vop_remove_args *); static int hpfs_bmap (struct vop_bmap_args *ap); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) static int hpfs_getpages (struct vop_getpages_args *ap); static int hpfs_putpages (struct vop_putpages_args *); static int hpfs_fsync (struct vop_fsync_args *ap); #endif static int hpfs_pathconf (struct vop_pathconf_args *ap); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) int hpfs_getpages(ap) struct vop_getpages_args *ap; @@ -313,7 +313,7 @@ hpfs_bmap(ap) if (ap->a_vpp != NULL) *ap->a_vpp = hp->h_devvp; -#if defined(__FreeBSD__) +#if defined(__DragonFly__) if (ap->a_runb != NULL) *ap->a_runb = 0; #endif @@ -479,7 +479,7 @@ hpfs_getattr(ap) dprintf(("hpfs_getattr(0x%x):\n", hp->h_no)); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) vap->va_fsid = dev2udev(hp->h_dev); #else /* defined(__NetBSD__) */ vap->va_fsid = ip->i_dev; @@ -593,7 +593,7 @@ hpfs_setattr(ap) } if (vap->va_size < hp->h_fn.fn_size) { -#if defined(__FreeBSD__) +#if defined(__DragonFly__) error = vtruncbuf(vp, td, vap->va_size, DEV_BSIZE); if (error) return (error); @@ -605,7 +605,7 @@ hpfs_setattr(ap) return (error); } else if (vap->va_size > hp->h_fn.fn_size) { -#if defined(__FreeBSD__) +#if defined(__DragonFly__) vnode_pager_setsize(vp, vap->va_size); #endif error = hpfs_extend(hp, vap->va_size); @@ -651,7 +651,7 @@ hpfs_inactive(ap) if (hp->h_flag & H_INVAL) { VOP__UNLOCK(vp,0,ap->a_td); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) vrecycle(vp, NULL, ap->a_td); #else /* defined(__NetBSD__) */ vgone(vp); @@ -1107,7 +1107,7 @@ readdone: if (!error && ap->a_ncookies != NULL) { struct dirent* dpStart; struct dirent* dp; -#if defined(__FreeBSD__) +#if defined(__DragonFly__) u_long *cookies; u_long *cookiep; #else /* defined(__NetBSD__) */ @@ -1121,7 +1121,7 @@ readdone: dpStart = (struct dirent *) ((caddr_t)uio->uio_iov->iov_base - (uio->uio_offset - off)); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP, M_WAITOK); #else /* defined(__NetBSD__) */ @@ -1356,7 +1356,7 @@ hpfs_pathconf(ap) * Global vfs data structures */ vop_t **hpfs_vnodeop_p; -#if defined(__FreeBSD__) +#if defined(__DragonFly__) struct vnodeopv_entry_desc hpfs_vnodeop_entries[] = { { &vop_default_desc, (vop_t *)vop_defaultop }, diff --git a/sys/vfs/msdosfs/msdosfs_vfsops.c b/sys/vfs/msdosfs/msdosfs_vfsops.c index cf6c9c4671..02392e21b6 100644 --- a/sys/vfs/msdosfs/msdosfs_vfsops.c +++ b/sys/vfs/msdosfs/msdosfs_vfsops.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_vfsops.c,v 1.60.2.6 2002/09/12 21:33:38 trhodes Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vfsops.c,v 1.9 2003/09/23 05:03:52 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vfsops.c,v 1.10 2004/02/05 21:03:37 rob Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -124,7 +124,7 @@ update_mp(mp, argp) bcopy(argp->lu, pmp->pm_lu, sizeof(pmp->pm_lu)); } -#ifndef __FreeBSD__ +#ifndef __DragonFly__ /* * GEMDOS knows nothing (yet) about win95 */ @@ -155,7 +155,7 @@ update_mp(mp, argp) return 0; } -#ifndef __FreeBSD__ +#ifndef __DragonFly__ int msdosfs_mountroot() { @@ -372,7 +372,7 @@ mountmsdosfs(devvp, mp, td, argp) struct msdosfsmount *pmp; struct buf *bp; dev_t dev = devvp->v_rdev; -#ifndef __FreeBSD__ +#ifndef __DragonFly__ struct partinfo dpart; int bsize = 0, dtype = 0, tmp; #endif @@ -411,7 +411,7 @@ mountmsdosfs(devvp, mp, td, argp) bp = NULL; /* both used in error_exit */ pmp = NULL; -#ifndef __FreeBSD__ +#ifndef __DragonFly__ if (argp->flags & MSDOSFSMNT_GEMDOSFS) { /* * We need the disklabel to calculate the size of a FAT entry @@ -451,7 +451,7 @@ mountmsdosfs(devvp, mp, td, argp) b50 = (struct byte_bpb50 *)bsp->bs50.bsBPB; b710 = (struct byte_bpb710 *)bsp->bs710.bsPBP; -#ifndef __FreeBSD__ +#ifndef __DragonFly__ if (!(argp->flags & MSDOSFSMNT_GEMDOSFS)) { #endif #ifndef MSDOSFS_NOCHECKSIG @@ -461,7 +461,7 @@ mountmsdosfs(devvp, mp, td, argp) goto error_exit; } #endif -#ifndef __FreeBSD__ +#ifndef __DragonFly__ } #endif @@ -488,7 +488,7 @@ mountmsdosfs(devvp, mp, td, argp) /* calculate the ratio of sector size to DEV_BSIZE */ pmp->pm_BlkPerSec = pmp->pm_BytesPerSec / DEV_BSIZE; -#ifndef __FreeBSD__ +#ifndef __DragonFly__ if (!(argp->flags & MSDOSFSMNT_GEMDOSFS)) { #endif /* XXX - We should probably check more values here */ @@ -502,7 +502,7 @@ mountmsdosfs(devvp, mp, td, argp) error = EINVAL; goto error_exit; } -#ifndef __FreeBSD__ +#ifndef __DragonFly__ } #endif @@ -587,7 +587,7 @@ mountmsdosfs(devvp, mp, td, argp) SecPerClust + 1; pmp->pm_fatsize = pmp->pm_FATsecs * DEV_BSIZE; /* XXX not used? */ -#ifndef __FreeBSD__ +#ifndef __DragonFly__ if (argp->flags & MSDOSFSMNT_GEMDOSFS) { if ((pmp->pm_maxcluster <= (0xff0 - 2)) && ((dtype == DTYPE_FLOPPY) || ((dtype == DTYPE_VNODE) diff --git a/sys/vfs/msdosfs/msdosfsmount.h b/sys/vfs/msdosfs/msdosfsmount.h index 12611ebbfc..fc221e4e35 100644 --- a/sys/vfs/msdosfs/msdosfsmount.h +++ b/sys/vfs/msdosfs/msdosfsmount.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfsmount.h,v 1.20.2.2 2000/10/27 09:45:07 bde Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfsmount.h,v 1.4 2003/08/27 02:03:23 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfsmount.h,v 1.5 2004/02/05 21:03:37 rob Exp $ */ /* $NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $ */ /*- @@ -234,7 +234,7 @@ struct msdosfs_args { #define MSDOSFSMNT_SHORTNAME 1 /* Force old DOS short names only */ #define MSDOSFSMNT_LONGNAME 2 /* Force Win'95 long names */ #define MSDOSFSMNT_NOWIN95 4 /* Completely ignore Win95 entries */ -#ifndef __FreeBSD__ +#ifndef __DragonFly__ #define MSDOSFSMNT_GEMDOSFS 8 /* This is a gemdos-flavour */ #endif #define MSDOSFSMNT_U2WTABLE 0x10 /* Local->Unicode and local<->DOS */ diff --git a/sys/vfs/ntfs/ntfs_inode.h b/sys/vfs/ntfs/ntfs_inode.h index f4bfc164b1..5070c59573 100644 --- a/sys/vfs/ntfs/ntfs_inode.h +++ b/sys/vfs/ntfs/ntfs_inode.h @@ -26,11 +26,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_inode.h,v 1.6 1999/12/03 20:37:39 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_inode.h,v 1.3 2003/07/06 21:23:53 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_inode.h,v 1.4 2004/02/05 21:03:37 rob Exp $ */ /* These flags are kept in i_flag. */ -#if defined(__FreeBSD__) +#if defined(__DragonFly__) #define IN_ACCESS 0x0001 /* Access time update request. */ #define IN_CHANGE 0x0002 /* Inode change time update request. */ #define IN_UPDATE 0x0004 /* Modification time update request. */ @@ -85,7 +85,7 @@ struct ntnode { #define FN_VALID 0x0002 #define FN_AATTRNAME 0x0004 /* space allocated for f_attrname */ struct fnode { -#ifdef __FreeBSD__ +#ifdef __DragonFly__ struct lock f_lock; /* fnode lock >Keep this first< */ #endif diff --git a/sys/vfs/ntfs/ntfs_subr.c b/sys/vfs/ntfs/ntfs_subr.c index b13c1b1263..3e059a4d63 100644 --- a/sys/vfs/ntfs/ntfs_subr.c +++ b/sys/vfs/ntfs/ntfs_subr.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_subr.c,v 1.7.2.4 2001/10/12 22:08:49 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.c,v 1.9 2003/12/29 18:04:50 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.c,v 1.10 2004/02/05 21:03:37 rob Exp $ */ #include @@ -55,7 +55,7 @@ #include "ntfs_compr.h" #include "ntfs_ihash.h" -#if defined(__FreeBSD__) +#if defined(__DragonFly__) MALLOC_DEFINE(M_NTFSNTVATTR, "NTFS vattr", "NTFS file attribute information"); MALLOC_DEFINE(M_NTFSRDATA, "NTFS res data", "NTFS resident data"); MALLOC_DEFINE(M_NTFSRUN, "NTFS vrun", "NTFS vrun storage"); @@ -1444,7 +1444,7 @@ ntfs_writentvattr_plain( off = ntfs_btocnoff(off); while (left && ccl) { -#if defined(__FreeBSD__) +#if defined(__DragonFly__) tocopy = min(left, min(ntfs_cntob(ccl) - off, MAXBSIZE - off)); #else @@ -1548,7 +1548,7 @@ ntfs_readntvattr_plain( off = ntfs_btocnoff(off); while (left && ccl) { -#if defined(__FreeBSD__) +#if defined(__DragonFly__) tocopy = min(left, min(ntfs_cntob(ccl) - off, MAXBSIZE - off)); diff --git a/sys/vfs/ntfs/ntfs_vfsops.c b/sys/vfs/ntfs/ntfs_vfsops.c index 3df89e1204..fd60cc05c3 100644 --- a/sys/vfs/ntfs/ntfs_vfsops.c +++ b/sys/vfs/ntfs/ntfs_vfsops.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_vfsops.c,v 1.20.2.5 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_vfsops.c,v 1.11 2003/10/19 18:11:37 hmp Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_vfsops.c,v 1.12 2004/02/05 21:03:37 rob Exp $ */ @@ -68,7 +68,7 @@ #include "ntfs_ihash.h" #include "ntfsmount.h" -#if defined(__FreeBSD__) +#if defined(__DragonFly__) MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure"); MALLOC_DEFINE(M_NTFSNTNODE,"NTFS ntnode", "NTFS ntnode information"); MALLOC_DEFINE(M_NTFSFNODE,"NTFS fnode", "NTFS fnode information"); @@ -87,7 +87,7 @@ static int ntfs_vptofh (struct vnode *, struct fid *); static int ntfs_fhtovp (struct mount *, struct fid *, struct vnode **); -#if !defined (__FreeBSD__) +#if !defined (__DragonFly__) static int ntfs_quotactl (struct mount *, int, uid_t, caddr_t, struct thread *); static int ntfs_start (struct mount *, int, struct thread *); @@ -95,7 +95,7 @@ static int ntfs_sync (struct mount *, int, struct ucred *, struct thread *); #endif -#if defined(__FreeBSD__) +#if defined(__DragonFly__) struct sockaddr; static int ntfs_mount (struct mount *, char *, caddr_t, struct nameidata *, struct thread *); @@ -119,7 +119,7 @@ static int ntfs_checkexp (struct mount *, struct mbuf *, */ static int ntfs_checkexp(mp, nam, exflagsp, credanonp) -#if defined(__FreeBSD__) +#if defined(__DragonFly__) struct mount *mp; struct sockaddr *nam; int *exflagsp; @@ -212,7 +212,7 @@ ntfs_init () ntfs_toupper_init(); } -#elif defined(__FreeBSD__) +#elif defined(__DragonFly__) static int ntfs_init ( @@ -228,7 +228,7 @@ ntfs_init ( static int ntfs_mount ( struct mount *mp, -#if defined(__FreeBSD__) +#if defined(__DragonFly__) char *path, caddr_t data, #else @@ -243,7 +243,7 @@ ntfs_mount ( struct vnode *devvp; struct ntfs_args args; -#ifdef __FreeBSD__ +#ifdef __DragonFly__ /* * Use NULL path to flag a root mount */ @@ -321,7 +321,7 @@ ntfs_mount ( NDFREE(ndp, NDF_ONLY_PNBUF); devvp = ndp->ni_vp; -#if defined(__FreeBSD__) +#if defined(__DragonFly__) if (!vn_isdisk(devvp, &err)) goto error_2; #else @@ -391,7 +391,7 @@ ntfs_mount ( goto error_2; } -#ifdef __FreeBSD__ +#ifdef __DragonFly__ dostatfs: #endif /* @@ -446,13 +446,13 @@ ntfs_mountfs(devvp, mp, argsp, td) if (error) return (error); ncount = vcount(devvp); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) if (devvp->v_object) ncount -= 1; #endif if (ncount > 1 && devvp != rootvp) return (EBUSY); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) VN_LOCK(devvp, LK_EXCLUSIVE | LK_RETRY, td); error = vinvalbuf(devvp, V_SAVE, td, 0, 0); VOP__UNLOCK(devvp, 0, td); @@ -603,7 +603,7 @@ ntfs_mountfs(devvp, mp, argsp, td) vput(vp); } -#if defined(__FreeBSD__) +#if defined(__DragonFly__) mp->mnt_stat.f_fsid.val[0] = dev2udev(dev); mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum; #else @@ -639,7 +639,7 @@ out: return (error); } -#if !defined(__FreeBSD__) +#if !defined(__DragonFly__) static int ntfs_start ( struct mount *mp, @@ -740,7 +740,7 @@ ntfs_root( return (0); } -#if !defined(__FreeBSD__) +#if !defined(__DragonFly__) static int ntfs_quotactl ( struct mount *mp, @@ -800,7 +800,7 @@ ntfs_statfs( mftsize = VTOF(ntmp->ntm_sysvn[NTFS_MFTINO])->f_size; mftallocated = VTOF(ntmp->ntm_sysvn[NTFS_MFTINO])->f_allocated; -#if defined(__FreeBSD__) +#if defined(__DragonFly__) sbp->f_type = mp->mnt_vfc->vfc_typenum; #elif defined(__NetBSD__) sbp->f_type = 0; @@ -828,7 +828,7 @@ ntfs_statfs( return (0); } -#if !defined(__FreeBSD__) +#if !defined(__DragonFly__) static int ntfs_sync ( struct mount *mp, @@ -970,7 +970,7 @@ ntfs_vgetex( } dprintf(("ntfs_vget: vnode: %p for ntnode: %d\n", vp,ino)); -#ifdef __FreeBSD__ +#ifdef __DragonFly__ lockinit(&fp->f_lock, 0, "fnode", VLKTIMEOUT, 0); #endif fp->f_vp = vp; @@ -1005,7 +1005,7 @@ ntfs_vget( LK_EXCLUSIVE | LK_RETRY, 0, curthread, vpp); } -#if defined(__FreeBSD__) +#if defined(__DragonFly__) static struct vfsops ntfs_vfsops = { ntfs_mount, vfs_stdstart, diff --git a/sys/vfs/ntfs/ntfs_vnops.c b/sys/vfs/ntfs/ntfs_vnops.c index aa8d6c3620..b449f1d139 100644 --- a/sys/vfs/ntfs/ntfs_vnops.c +++ b/sys/vfs/ntfs/ntfs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_vnops.c,v 1.9.2.4 2002/08/06 19:35:18 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_vnops.c,v 1.9 2003/10/09 22:27:26 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_vnops.c,v 1.10 2004/02/05 21:03:37 rob Exp $ * */ @@ -62,7 +62,7 @@ #include #include #include -#if defined(__FreeBSD__) +#if defined(__DragonFly__) #include #endif #include @@ -93,7 +93,7 @@ static int ntfs_close (struct vop_close_args *ap); static int ntfs_readdir (struct vop_readdir_args *ap); static int ntfs_lookup (struct vop_lookup_args *ap); static int ntfs_bmap (struct vop_bmap_args *ap); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) static int ntfs_getpages (struct vop_getpages_args *ap); static int ntfs_putpages (struct vop_putpages_args *); static int ntfs_fsync (struct vop_fsync_args *ap); @@ -104,7 +104,7 @@ static int ntfs_pathconf (void *); int ntfs_prtactive = 1; /* 1 => print out reclaim of active vnodes */ -#if defined(__FreeBSD__) +#if defined(__DragonFly__) int ntfs_getpages(ap) struct vop_getpages_args *ap; @@ -207,7 +207,7 @@ ntfs_read(ap) return (error); } -#if !defined(__FreeBSD__) +#if !defined(__DragonFly__) static int ntfs_bypass(ap) @@ -239,7 +239,7 @@ ntfs_getattr(ap) dprintf(("ntfs_getattr: %d, flags: %d\n",ip->i_number,ip->i_flag)); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) vap->va_fsid = dev2udev(ip->i_dev); #else /* NetBSD */ vap->va_fsid = ip->i_dev; @@ -349,7 +349,7 @@ ntfs_strategy(ap) struct ntfsmount *ntmp = ip->i_mp; int error; -#ifdef __FreeBSD__ +#ifdef __DragonFly__ dprintf(("ntfs_strategy: offset: %d, blkno: %d, lblkno: %d\n", (u_int32_t)bp->b_offset,(u_int32_t)bp->b_blkno, (u_int32_t)bp->b_lblkno)); @@ -691,7 +691,7 @@ ntfs_readdir(ap) if (!error && ap->a_ncookies != NULL) { struct dirent* dpStart; struct dirent* dp; -#if defined(__FreeBSD__) +#if defined(__DragonFly__) u_long *cookies; u_long *cookiep; #else /* defined(__NetBSD__) */ @@ -705,7 +705,7 @@ ntfs_readdir(ap) dpStart = (struct dirent *) ((caddr_t)uio->uio_iov->iov_base - (uio->uio_offset - off)); -#if defined(__FreeBSD__) +#if defined(__DragonFly__) MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP, M_WAITOK); #else /* defined(__NetBSD__) */ @@ -831,7 +831,7 @@ ntfs_lookup(ap) return (error); } -#if defined(__FreeBSD__) +#if defined(__DragonFly__) /* * Flush the blocks of a file to disk. * @@ -898,7 +898,7 @@ ntfs_pathconf(v) * Global vfs data structures */ vop_t **ntfs_vnodeop_p; -#if defined(__FreeBSD__) +#if defined(__DragonFly__) static struct vnodeopv_entry_desc ntfs_vnodeop_entries[] = { { &vop_default_desc, (vop_t *)vop_defaultop }, -- 2.41.0