mirror of
https://github.com/opnsense/src.git
synced 2026-06-10 17:22:46 -04:00
Removed __FreeBSD__ ifdefs.
This commit is contained in:
Bruce Evans
parent
52aef196f7
commit
2f169e4b76
26 changed files with 0 additions and 374 deletions
|
|
@ -39,12 +39,7 @@
|
|||
* @(#)ext2_alloc.c 8.8 (Berkeley) 2/21/94
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "quota.h"
|
||||
#include "diagnostic.h"
|
||||
#else
|
||||
#include "opt_quota.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -395,9 +390,6 @@ ext2_valloc(pvp, mode, cred, vpp)
|
|||
register struct inode *ip;
|
||||
ino_t ino;
|
||||
int i, error;
|
||||
#if !defined(__FreeBSD__)
|
||||
struct timeval time;
|
||||
#endif
|
||||
|
||||
*vpp = NULL;
|
||||
pip = VTOI(pvp);
|
||||
|
|
@ -434,9 +426,6 @@ ext2_valloc(pvp, mode, cred, vpp)
|
|||
* Set up a new generation number for this inode.
|
||||
* XXX check if this makes sense in ext2
|
||||
*/
|
||||
#if !defined(__FreeBSD__)
|
||||
gettime(&time);
|
||||
#endif
|
||||
if (++nextgennumber < (u_long)time.tv_sec)
|
||||
nextgennumber = time.tv_sec;
|
||||
ip->i_gen = nextgennumber;
|
||||
|
|
|
|||
|
|
@ -39,10 +39,6 @@
|
|||
* @(#)ffs_balloc.c 8.4 (Berkeley) 9/23/93
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "diagnostic.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/buf.h>
|
||||
|
|
@ -151,11 +147,7 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
|||
bp = getblk(vp, bn, nsize, 0, 0);
|
||||
bp->b_blkno = fsbtodb(fs, newb);
|
||||
if (flags & B_CLRBUF)
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_bio_clrbuf(bp);
|
||||
#else
|
||||
clrbuf(bp);
|
||||
#endif
|
||||
}
|
||||
ip->i_db[bn] = dbtofsb(fs, bp->b_blkno);
|
||||
ip->i_flag |= IN_CHANGE | IN_UPDATE;
|
||||
|
|
@ -201,11 +193,7 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
|||
nb = newb;
|
||||
bp = getblk(vp, indirs[1].in_lbn, fs->s_blocksize, 0, 0);
|
||||
bp->b_blkno = fsbtodb(fs, newb);
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_bio_clrbuf(bp);
|
||||
#else
|
||||
clrbuf(bp);
|
||||
#endif
|
||||
/*
|
||||
* Write synchronously so that indirect blocks
|
||||
* never point at garbage.
|
||||
|
|
@ -257,11 +245,7 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
|||
nb = newb;
|
||||
nbp = getblk(vp, indirs[i].in_lbn, fs->s_blocksize, 0, 0);
|
||||
nbp->b_blkno = fsbtodb(fs, nb);
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_bio_clrbuf(nbp);
|
||||
#else
|
||||
clrbuf(nbp);
|
||||
#endif
|
||||
/*
|
||||
* Write synchronously so that indirect blocks
|
||||
* never point at garbage.
|
||||
|
|
@ -297,11 +281,7 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
|||
nbp = getblk(vp, lbn, fs->s_blocksize, 0, 0);
|
||||
nbp->b_blkno = fsbtodb(fs, nb);
|
||||
if (flags & B_CLRBUF)
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_bio_clrbuf(nbp);
|
||||
#else
|
||||
clrbuf(nbp);
|
||||
#endif
|
||||
bap[indirs[i].in_off] = nb;
|
||||
/*
|
||||
* If required, write synchronously, otherwise use
|
||||
|
|
|
|||
|
|
@ -93,11 +93,6 @@ void ext2_ei2di __P((struct ext2_inode *ei, struct dinode *di));
|
|||
void ext2_di2ei __P((struct dinode *di, struct ext2_inode *ei));
|
||||
void mark_buffer_dirty __P((struct buf *bh));
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
int bwrite(); /* FFS needs a bwrite routine. XXX */
|
||||
#define gettime get_time
|
||||
#endif
|
||||
|
||||
/*
|
||||
* This macro allows the ufs code to distinguish between an EXT2 and a
|
||||
* non-ext2(FFS/LFS) vnode.
|
||||
|
|
|
|||
|
|
@ -23,16 +23,6 @@
|
|||
|
||||
#include <sys/types.h>
|
||||
|
||||
#ifdef __i386__
|
||||
#if defined(__FreeBSD__)
|
||||
#include <machine/types.h>
|
||||
#else
|
||||
#include <i386/types.h>
|
||||
#endif
|
||||
#else
|
||||
#error need processor specific types
|
||||
#endif
|
||||
|
||||
#define __u32 u_int32_t
|
||||
#define u32 u_int32_t
|
||||
#define __u16 u_int16_t
|
||||
|
|
|
|||
|
|
@ -30,10 +30,8 @@
|
|||
|
||||
#define EXT2_MAX_GROUP_LOADED 8
|
||||
|
||||
#if defined(LITES) || defined(__FreeBSD__)
|
||||
#define buffer_head buf
|
||||
#define MAXMNTLEN 512
|
||||
#endif
|
||||
|
||||
/*
|
||||
* second extended-fs super-block data in memory
|
||||
|
|
@ -59,14 +57,10 @@ struct ext2_sb_info {
|
|||
unsigned long s_block_bitmap_number[EXT2_MAX_GROUP_LOADED];
|
||||
struct buffer_head * s_block_bitmap[EXT2_MAX_GROUP_LOADED];
|
||||
int s_rename_lock;
|
||||
#if !defined(LITES) && !defined(__FreeBSD__)
|
||||
struct wait_queue * s_rename_wait;
|
||||
#endif
|
||||
unsigned long s_mount_opt;
|
||||
unsigned short s_resuid;
|
||||
unsigned short s_resgid;
|
||||
unsigned short s_mount_state;
|
||||
#if defined(LITES) || defined(__FreeBSD__)
|
||||
/*
|
||||
stuff that FFS keeps in its super block or that linux
|
||||
has in its non-ext2 specific super block and which is
|
||||
|
|
@ -81,7 +75,6 @@ struct ext2_sb_info {
|
|||
char s_dirt; /* fs modified flag */
|
||||
|
||||
char fs_fsmnt[MAXMNTLEN]; /* name mounted on */
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif /* _LINUX_EXT2_FS_SB */
|
||||
|
|
|
|||
|
|
@ -39,12 +39,7 @@
|
|||
* @(#)ext2_inode.c 8.5 (Berkeley) 12/30/93
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "quota.h"
|
||||
#include "diagnostic.h"
|
||||
#else
|
||||
#include "opt_quota.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -54,9 +49,6 @@
|
|||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/time.h>
|
||||
#if !defined(__FreeBSD__)
|
||||
#include <sys/trace.h>
|
||||
#endif
|
||||
|
||||
#include <vm/vm.h>
|
||||
#include <vm/vm_extern.h>
|
||||
|
|
@ -100,9 +92,6 @@ ext2_update(vp, access, modify, waitfor)
|
|||
struct buf *bp;
|
||||
struct inode *ip;
|
||||
int error;
|
||||
#if !defined(__FreeBSD__)
|
||||
struct timeval time;
|
||||
#endif
|
||||
|
||||
ip = VTOI(vp);
|
||||
if (vp->v_mount->mnt_flag & MNT_RDONLY) {
|
||||
|
|
@ -120,9 +109,6 @@ ext2_update(vp, access, modify, waitfor)
|
|||
ip->i_modrev++;
|
||||
}
|
||||
if (ip->i_flag & IN_CHANGE) {
|
||||
#if !defined(__FreeBSD__)
|
||||
gettime(&time);
|
||||
#endif
|
||||
ip->i_ctime = time.tv_sec;
|
||||
}
|
||||
ip->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE);
|
||||
|
|
@ -224,9 +210,6 @@ printf("ext2_truncate called %d to %d\n", VTOI(ovp)->i_number, length);
|
|||
aflags))
|
||||
return (error);
|
||||
oip->i_size = length;
|
||||
#if !defined(__FreeBSD__)
|
||||
(void) vnode_pager_uncache(ovp);
|
||||
#endif
|
||||
if (aflags & IO_SYNC)
|
||||
bwrite(bp);
|
||||
else
|
||||
|
|
@ -255,9 +238,6 @@ printf("ext2_truncate called %d to %d\n", VTOI(ovp)->i_number, length);
|
|||
return (error);
|
||||
oip->i_size = length;
|
||||
size = blksize(fs, oip, lbn);
|
||||
#if !defined(__FreeBSD__)
|
||||
(void) vnode_pager_uncache(ovp);
|
||||
#endif
|
||||
bzero((char *)bp->b_data + offset, (u_int)(size - offset));
|
||||
allocbuf(bp, size);
|
||||
if (aflags & IO_SYNC)
|
||||
|
|
@ -452,22 +432,12 @@ ext2_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
|
|||
vp = ITOV(ip);
|
||||
bp = getblk(vp, lbn, (int)fs->s_blocksize, 0, 0);
|
||||
if (bp->b_flags & (B_DONE | B_DELWRI)) {
|
||||
/* Braces must be here in case trace evaluates to nothing. */
|
||||
#if !defined(__FreeBSD__)
|
||||
trace(TR_BREADHIT, pack(vp, fs->s_blocksize), lbn);
|
||||
#endif
|
||||
} else {
|
||||
#if !defined(__FreeBSD__)
|
||||
trace(TR_BREADMISS, pack(vp, fs->s_blocksize), lbn);
|
||||
get_proc()->p_stats->p_ru.ru_inblock++; /* pay for read */
|
||||
#endif
|
||||
bp->b_flags |= B_READ;
|
||||
if (bp->b_bcount > bp->b_bufsize)
|
||||
panic("ext2_indirtrunc: bad buffer size");
|
||||
bp->b_blkno = dbn;
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_busy_pages(bp, 0);
|
||||
#endif
|
||||
VOP_STRATEGY(bp);
|
||||
error = biowait(bp);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,17 +66,8 @@ ext2_print_dinode( di )
|
|||
printf( "Links: %3d Blockcount: %d\n",
|
||||
di->di_nlink, di->di_blocks);
|
||||
printf( "ctime: 0x%x", di->di_ctime);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_ctime);
|
||||
#endif
|
||||
printf( "atime: 0x%x", di->di_atime);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_atime);
|
||||
#endif
|
||||
printf( "mtime: 0x%x", di->di_mtime);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_mtime);
|
||||
#endif
|
||||
printf( "BLOCKS: ");
|
||||
for(i=0; i < (di->di_blocks <= 24 ? ((di->di_blocks+1)/2): 12); i++)
|
||||
printf("%d ", di->di_db[i]);
|
||||
|
|
|
|||
|
|
@ -73,9 +73,7 @@ int ll_w_block(struct buf * bp, int waitfor)
|
|||
bp->b_flags &= ~(B_READ|B_DONE|B_ERROR|B_DELWRI);
|
||||
bp->b_flags |= B_WRITEINPROG;
|
||||
bp->b_vp->v_numoutput++;
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_busy_pages(bp, 1);
|
||||
#endif
|
||||
VOP_STRATEGY(bp);
|
||||
return waitfor ? biowait(bp) : 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,10 +44,6 @@
|
|||
* @(#)ufs_lookup.c 8.6 (Berkeley) 4/1/94
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "diagnostic.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/namei.h>
|
||||
|
|
|
|||
|
|
@ -39,10 +39,6 @@
|
|||
* @(#)ufs_readwrite.c 8.7 (Berkeley) 1/21/94
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "diagnostic.h"
|
||||
#endif
|
||||
|
||||
#define BLKSIZE(a, b, c) blksize(a, b, c)
|
||||
#define FS struct ext2_sb_info
|
||||
#define I_FS i_e2fs
|
||||
|
|
@ -146,11 +142,6 @@ READ(ap)
|
|||
uiomove((char *)bp->b_data + blkoffset, (int)xfersize, uio);
|
||||
if (error)
|
||||
break;
|
||||
#if !defined(__FreeBSD__)
|
||||
if (S_ISREG(mode) && (xfersize + blkoffset == fs->s_frag_size ||
|
||||
uio->uio_offset == ip->i_size))
|
||||
bp->b_flags |= B_AGE;
|
||||
#endif
|
||||
|
||||
bqrelse(bp);
|
||||
}
|
||||
|
|
@ -240,10 +231,8 @@ WRITE(ap)
|
|||
if (uio->uio_resid < xfersize)
|
||||
xfersize = uio->uio_resid;
|
||||
|
||||
#if defined(__FreeBSD__)
|
||||
if (uio->uio_offset + xfersize > ip->i_size)
|
||||
vnode_pager_setsize(vp, uio->uio_offset + xfersize);
|
||||
#endif
|
||||
|
||||
if (fs->s_frag_size > xfersize)
|
||||
flags |= B_CLRBUF;
|
||||
|
|
@ -257,13 +246,7 @@ WRITE(ap)
|
|||
|
||||
if (uio->uio_offset + xfersize > ip->i_size) {
|
||||
ip->i_size = uio->uio_offset + xfersize;
|
||||
#if !defined(__FreeBSD__)
|
||||
vnode_pager_setsize(vp, (u_long)ip->i_size);
|
||||
#endif
|
||||
}
|
||||
#if !defined(__FreeBSD__)
|
||||
(void)vnode_pager_uncache(vp);
|
||||
#endif
|
||||
|
||||
size = BLKSIZE(fs, ip, lbn) - bp->b_resid;
|
||||
if (size < xfersize)
|
||||
|
|
@ -278,20 +261,13 @@ WRITE(ap)
|
|||
(void)bwrite(bp);
|
||||
} else if (xfersize + blkoffset == fs->s_frag_size) {
|
||||
if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERW) == 0) {
|
||||
#if defined(__FreeBSD__)
|
||||
bp->b_flags |= B_CLUSTEROK;
|
||||
#endif
|
||||
cluster_write(bp, ip->i_size);
|
||||
} else {
|
||||
#if !defined(__FreeBSD__)
|
||||
bp->b_flags |= B_AGE;
|
||||
#endif
|
||||
bawrite(bp);
|
||||
}
|
||||
} else {
|
||||
#if defined(__FreeBSD__)
|
||||
bp->b_flags |= B_CLUSTEROK;
|
||||
#endif
|
||||
bdwrite(bp);
|
||||
}
|
||||
if (error || xfersize == 0)
|
||||
|
|
|
|||
|
|
@ -101,13 +101,8 @@ ext2_checkoverlap(bp, ip)
|
|||
if (ep == bp || (ep->b_flags & B_INVAL) ||
|
||||
ep->b_vp == NULLVP)
|
||||
continue;
|
||||
#if !defined(__FreeBSD__)
|
||||
if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0, NULL))
|
||||
continue;
|
||||
#else
|
||||
if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0, NULL, NULL))
|
||||
continue;
|
||||
#endif
|
||||
if (vp != ip->i_devvp)
|
||||
continue;
|
||||
/* look for overlap */
|
||||
|
|
|
|||
|
|
@ -39,11 +39,7 @@
|
|||
* @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "quota.h"
|
||||
#else
|
||||
#include "opt_quota.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -102,16 +98,12 @@ static struct vfsops ext2fs_vfsops = {
|
|||
ext2_init,
|
||||
};
|
||||
|
||||
#if defined(__FreeBSD__)
|
||||
VFS_SET(ext2fs_vfsops, ext2fs, MOUNT_EXT2FS, 0);
|
||||
#define bsd_malloc malloc
|
||||
#define bsd_free free
|
||||
#endif
|
||||
|
||||
extern u_long nextgennumber;
|
||||
#ifdef __FreeBSD__
|
||||
static int ext2fs_inode_hash_lock;
|
||||
#endif
|
||||
|
||||
static int compute_sb_data __P((struct vnode * devvp,
|
||||
struct ext2_super_block * es,
|
||||
|
|
@ -130,16 +122,9 @@ static int ext2_mountroot __P((void));
|
|||
static int
|
||||
ext2_mountroot()
|
||||
{
|
||||
#if !defined(__FreeBSD__)
|
||||
extern struct vnode *rootvp;
|
||||
#endif
|
||||
register struct ext2_sb_info *fs;
|
||||
register struct mount *mp;
|
||||
#if defined(__FreeBSD__)
|
||||
struct proc *p = curproc;
|
||||
#else
|
||||
struct proc *p = get_proc(); /* XXX */
|
||||
#endif
|
||||
struct ufsmount *ump;
|
||||
u_int size;
|
||||
int error;
|
||||
|
|
@ -165,11 +150,7 @@ ext2_mountroot()
|
|||
bsd_free(mp, M_MOUNT);
|
||||
return (error);
|
||||
}
|
||||
#if defined(__FreeBSD__)
|
||||
CIRCLEQ_INSERT_HEAD(&mountlist, mp, mnt_list);
|
||||
#else
|
||||
TAILQ_INSERT_TAIL(&mountlist, mp, mnt_list);
|
||||
#endif
|
||||
mp->mnt_flag |= MNT_ROOTFS;
|
||||
mp->mnt_vnodecovered = NULLVP;
|
||||
ump = VFSTOUFS(mp);
|
||||
|
|
@ -571,9 +552,6 @@ ext2_mountfs(devvp, mp, p)
|
|||
int havepart = 0;
|
||||
int error, i, size;
|
||||
int ronly;
|
||||
#if !defined(__FreeBSD__)
|
||||
extern struct vnode *rootvp;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Disallow multiple mounts of the same device.
|
||||
|
|
@ -854,18 +832,11 @@ ext2_sync(mp, waitfor, cred, p)
|
|||
* is still in the buffer cache.
|
||||
*/
|
||||
if (fs->s_dirt) {
|
||||
#if !defined(__FreeBSD__)
|
||||
struct timeval time;
|
||||
#endif
|
||||
|
||||
if (fs->s_rd_only != 0) { /* XXX */
|
||||
printf("fs = %s\n", fs->fs_fsmnt);
|
||||
panic("update: rofs mod");
|
||||
}
|
||||
fs->s_dirt = 0;
|
||||
#if !defined(__FreeBSD__)
|
||||
get_time(&time);
|
||||
#endif
|
||||
fs->s_es->s_wtime = time.tv_sec;
|
||||
allerror = ext2_sbupdate(ump, waitfor);
|
||||
}
|
||||
|
|
@ -933,7 +904,6 @@ restart:
|
|||
if ((*vpp = ufs_ihashget(dev, ino)) != NULL)
|
||||
return (0);
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
/*
|
||||
* Lock out the creation of new entries in the FFS hash table in
|
||||
* case getnewvnode() or MALLOC() blocks, otherwise a duplicate
|
||||
|
|
@ -947,7 +917,6 @@ restart:
|
|||
goto restart;
|
||||
}
|
||||
ext2fs_inode_hash_lock = 1;
|
||||
#endif
|
||||
|
||||
/* Allocate a new vnode/inode. */
|
||||
if (error = getnewvnode(VT_UFS, mp, ext2_vnodeop_p, &vp)) {
|
||||
|
|
@ -955,9 +924,6 @@ restart:
|
|||
return (error);
|
||||
}
|
||||
MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, M_WAITOK);
|
||||
#ifndef __FreeBSD__
|
||||
insmntque(vp, mp);
|
||||
#endif
|
||||
bzero((caddr_t)ip, sizeof(struct inode));
|
||||
vp->v_data = ip;
|
||||
ip->i_vnode = vp;
|
||||
|
|
@ -976,11 +942,9 @@ restart:
|
|||
*/
|
||||
ufs_ihashins(ip);
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
if (ext2fs_inode_hash_lock < 0)
|
||||
wakeup(&ext2fs_inode_hash_lock);
|
||||
ext2fs_inode_hash_lock = 0;
|
||||
#endif
|
||||
|
||||
/* Read in the disk contents for the inode, copy into the inode. */
|
||||
/* Read in the disk contents for the inode, copy into the inode. */
|
||||
|
|
@ -1041,10 +1005,6 @@ printf("ext2_vget(%d) dbn= %d ", ino, fsbtodb(fs, ino_to_fsba(fs, ino)));
|
|||
* already have one. This should only happen on old filesystems.
|
||||
*/
|
||||
if (ip->i_gen == 0) {
|
||||
#if !defined(__FreeBSD__)
|
||||
struct timeval time;
|
||||
get_time(&time);
|
||||
#endif
|
||||
if (++nextgennumber < (u_long)time.tv_sec)
|
||||
nextgennumber = time.tv_sec;
|
||||
ip->i_gen = nextgennumber;
|
||||
|
|
|
|||
|
|
@ -41,11 +41,6 @@
|
|||
|
||||
#include "opt_quota.h"
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "fifo.h"
|
||||
#include "diagnostic.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/resourcevar.h>
|
||||
|
|
@ -62,11 +57,7 @@
|
|||
#include <vm/vm.h>
|
||||
#include <vm/vm_extern.h>
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include <ufs/ufs/lockf.h>
|
||||
#else
|
||||
#include <sys/signalvar.h>
|
||||
#endif
|
||||
#include <ufs/ufs/dir.h>
|
||||
#include <ufs/ufs/quota.h>
|
||||
#include <ufs/ufs/inode.h>
|
||||
|
|
@ -136,11 +127,9 @@ static struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
|
|||
static struct vnodeopv_desc ext2fs_fifoop_opv_desc =
|
||||
{ &ext2_fifoop_p, ext2_fifoop_entries };
|
||||
|
||||
#if defined(__FreeBSD__)
|
||||
VNODEOP_SET(ext2fs_vnodeop_opv_desc);
|
||||
VNODEOP_SET(ext2fs_specop_opv_desc);
|
||||
VNODEOP_SET(ext2fs_fifoop_opv_desc);
|
||||
#endif
|
||||
|
||||
#include <gnu/ext2fs/ext2_readwrite.c>
|
||||
|
||||
|
|
@ -186,13 +175,8 @@ ext2_fsync(ap)
|
|||
int s;
|
||||
|
||||
/*
|
||||
* Clean memory object.
|
||||
* XXX add this to all file systems.
|
||||
* XXX why is all this fs specific?
|
||||
*/
|
||||
#if !defined(__FreeBSD__)
|
||||
vn_pager_sync(vp, ap->a_waitfor);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Flush all dirty buffers associated with a vnode.
|
||||
|
|
@ -223,11 +207,7 @@ loop:
|
|||
if (ap->a_waitfor == MNT_WAIT) {
|
||||
while (vp->v_numoutput) {
|
||||
vp->v_flag |= VBWAIT;
|
||||
#if !defined(__FreeBSD__)
|
||||
sleep((caddr_t)&vp->v_numoutput, PRIBIO + 1);
|
||||
#else
|
||||
tsleep((caddr_t)&vp->v_numoutput, PRIBIO + 1, "extfsn", 0);
|
||||
#endif
|
||||
}
|
||||
#if DIAGNOSTIC
|
||||
if (vp->v_dirtyblkhd.lh_first) {
|
||||
|
|
|
|||
|
|
@ -39,12 +39,7 @@
|
|||
* @(#)ext2_alloc.c 8.8 (Berkeley) 2/21/94
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "quota.h"
|
||||
#include "diagnostic.h"
|
||||
#else
|
||||
#include "opt_quota.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -395,9 +390,6 @@ ext2_valloc(pvp, mode, cred, vpp)
|
|||
register struct inode *ip;
|
||||
ino_t ino;
|
||||
int i, error;
|
||||
#if !defined(__FreeBSD__)
|
||||
struct timeval time;
|
||||
#endif
|
||||
|
||||
*vpp = NULL;
|
||||
pip = VTOI(pvp);
|
||||
|
|
@ -434,9 +426,6 @@ ext2_valloc(pvp, mode, cred, vpp)
|
|||
* Set up a new generation number for this inode.
|
||||
* XXX check if this makes sense in ext2
|
||||
*/
|
||||
#if !defined(__FreeBSD__)
|
||||
gettime(&time);
|
||||
#endif
|
||||
if (++nextgennumber < (u_long)time.tv_sec)
|
||||
nextgennumber = time.tv_sec;
|
||||
ip->i_gen = nextgennumber;
|
||||
|
|
|
|||
|
|
@ -39,10 +39,6 @@
|
|||
* @(#)ffs_balloc.c 8.4 (Berkeley) 9/23/93
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "diagnostic.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/buf.h>
|
||||
|
|
@ -151,11 +147,7 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
|||
bp = getblk(vp, bn, nsize, 0, 0);
|
||||
bp->b_blkno = fsbtodb(fs, newb);
|
||||
if (flags & B_CLRBUF)
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_bio_clrbuf(bp);
|
||||
#else
|
||||
clrbuf(bp);
|
||||
#endif
|
||||
}
|
||||
ip->i_db[bn] = dbtofsb(fs, bp->b_blkno);
|
||||
ip->i_flag |= IN_CHANGE | IN_UPDATE;
|
||||
|
|
@ -201,11 +193,7 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
|||
nb = newb;
|
||||
bp = getblk(vp, indirs[1].in_lbn, fs->s_blocksize, 0, 0);
|
||||
bp->b_blkno = fsbtodb(fs, newb);
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_bio_clrbuf(bp);
|
||||
#else
|
||||
clrbuf(bp);
|
||||
#endif
|
||||
/*
|
||||
* Write synchronously so that indirect blocks
|
||||
* never point at garbage.
|
||||
|
|
@ -257,11 +245,7 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
|||
nb = newb;
|
||||
nbp = getblk(vp, indirs[i].in_lbn, fs->s_blocksize, 0, 0);
|
||||
nbp->b_blkno = fsbtodb(fs, nb);
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_bio_clrbuf(nbp);
|
||||
#else
|
||||
clrbuf(nbp);
|
||||
#endif
|
||||
/*
|
||||
* Write synchronously so that indirect blocks
|
||||
* never point at garbage.
|
||||
|
|
@ -297,11 +281,7 @@ ext2_debug("ext2_balloc called (%d, %d, %d)\n",
|
|||
nbp = getblk(vp, lbn, fs->s_blocksize, 0, 0);
|
||||
nbp->b_blkno = fsbtodb(fs, nb);
|
||||
if (flags & B_CLRBUF)
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_bio_clrbuf(nbp);
|
||||
#else
|
||||
clrbuf(nbp);
|
||||
#endif
|
||||
bap[indirs[i].in_off] = nb;
|
||||
/*
|
||||
* If required, write synchronously, otherwise use
|
||||
|
|
|
|||
|
|
@ -93,11 +93,6 @@ void ext2_ei2di __P((struct ext2_inode *ei, struct dinode *di));
|
|||
void ext2_di2ei __P((struct dinode *di, struct ext2_inode *ei));
|
||||
void mark_buffer_dirty __P((struct buf *bh));
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
int bwrite(); /* FFS needs a bwrite routine. XXX */
|
||||
#define gettime get_time
|
||||
#endif
|
||||
|
||||
/*
|
||||
* This macro allows the ufs code to distinguish between an EXT2 and a
|
||||
* non-ext2(FFS/LFS) vnode.
|
||||
|
|
|
|||
|
|
@ -23,16 +23,6 @@
|
|||
|
||||
#include <sys/types.h>
|
||||
|
||||
#ifdef __i386__
|
||||
#if defined(__FreeBSD__)
|
||||
#include <machine/types.h>
|
||||
#else
|
||||
#include <i386/types.h>
|
||||
#endif
|
||||
#else
|
||||
#error need processor specific types
|
||||
#endif
|
||||
|
||||
#define __u32 u_int32_t
|
||||
#define u32 u_int32_t
|
||||
#define __u16 u_int16_t
|
||||
|
|
|
|||
|
|
@ -30,10 +30,8 @@
|
|||
|
||||
#define EXT2_MAX_GROUP_LOADED 8
|
||||
|
||||
#if defined(LITES) || defined(__FreeBSD__)
|
||||
#define buffer_head buf
|
||||
#define MAXMNTLEN 512
|
||||
#endif
|
||||
|
||||
/*
|
||||
* second extended-fs super-block data in memory
|
||||
|
|
@ -59,14 +57,10 @@ struct ext2_sb_info {
|
|||
unsigned long s_block_bitmap_number[EXT2_MAX_GROUP_LOADED];
|
||||
struct buffer_head * s_block_bitmap[EXT2_MAX_GROUP_LOADED];
|
||||
int s_rename_lock;
|
||||
#if !defined(LITES) && !defined(__FreeBSD__)
|
||||
struct wait_queue * s_rename_wait;
|
||||
#endif
|
||||
unsigned long s_mount_opt;
|
||||
unsigned short s_resuid;
|
||||
unsigned short s_resgid;
|
||||
unsigned short s_mount_state;
|
||||
#if defined(LITES) || defined(__FreeBSD__)
|
||||
/*
|
||||
stuff that FFS keeps in its super block or that linux
|
||||
has in its non-ext2 specific super block and which is
|
||||
|
|
@ -81,7 +75,6 @@ struct ext2_sb_info {
|
|||
char s_dirt; /* fs modified flag */
|
||||
|
||||
char fs_fsmnt[MAXMNTLEN]; /* name mounted on */
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif /* _LINUX_EXT2_FS_SB */
|
||||
|
|
|
|||
|
|
@ -39,12 +39,7 @@
|
|||
* @(#)ext2_inode.c 8.5 (Berkeley) 12/30/93
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "quota.h"
|
||||
#include "diagnostic.h"
|
||||
#else
|
||||
#include "opt_quota.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -54,9 +49,6 @@
|
|||
#include <sys/kernel.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/time.h>
|
||||
#if !defined(__FreeBSD__)
|
||||
#include <sys/trace.h>
|
||||
#endif
|
||||
|
||||
#include <vm/vm.h>
|
||||
#include <vm/vm_extern.h>
|
||||
|
|
@ -100,9 +92,6 @@ ext2_update(vp, access, modify, waitfor)
|
|||
struct buf *bp;
|
||||
struct inode *ip;
|
||||
int error;
|
||||
#if !defined(__FreeBSD__)
|
||||
struct timeval time;
|
||||
#endif
|
||||
|
||||
ip = VTOI(vp);
|
||||
if (vp->v_mount->mnt_flag & MNT_RDONLY) {
|
||||
|
|
@ -120,9 +109,6 @@ ext2_update(vp, access, modify, waitfor)
|
|||
ip->i_modrev++;
|
||||
}
|
||||
if (ip->i_flag & IN_CHANGE) {
|
||||
#if !defined(__FreeBSD__)
|
||||
gettime(&time);
|
||||
#endif
|
||||
ip->i_ctime = time.tv_sec;
|
||||
}
|
||||
ip->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE);
|
||||
|
|
@ -224,9 +210,6 @@ printf("ext2_truncate called %d to %d\n", VTOI(ovp)->i_number, length);
|
|||
aflags))
|
||||
return (error);
|
||||
oip->i_size = length;
|
||||
#if !defined(__FreeBSD__)
|
||||
(void) vnode_pager_uncache(ovp);
|
||||
#endif
|
||||
if (aflags & IO_SYNC)
|
||||
bwrite(bp);
|
||||
else
|
||||
|
|
@ -255,9 +238,6 @@ printf("ext2_truncate called %d to %d\n", VTOI(ovp)->i_number, length);
|
|||
return (error);
|
||||
oip->i_size = length;
|
||||
size = blksize(fs, oip, lbn);
|
||||
#if !defined(__FreeBSD__)
|
||||
(void) vnode_pager_uncache(ovp);
|
||||
#endif
|
||||
bzero((char *)bp->b_data + offset, (u_int)(size - offset));
|
||||
allocbuf(bp, size);
|
||||
if (aflags & IO_SYNC)
|
||||
|
|
@ -452,22 +432,12 @@ ext2_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
|
|||
vp = ITOV(ip);
|
||||
bp = getblk(vp, lbn, (int)fs->s_blocksize, 0, 0);
|
||||
if (bp->b_flags & (B_DONE | B_DELWRI)) {
|
||||
/* Braces must be here in case trace evaluates to nothing. */
|
||||
#if !defined(__FreeBSD__)
|
||||
trace(TR_BREADHIT, pack(vp, fs->s_blocksize), lbn);
|
||||
#endif
|
||||
} else {
|
||||
#if !defined(__FreeBSD__)
|
||||
trace(TR_BREADMISS, pack(vp, fs->s_blocksize), lbn);
|
||||
get_proc()->p_stats->p_ru.ru_inblock++; /* pay for read */
|
||||
#endif
|
||||
bp->b_flags |= B_READ;
|
||||
if (bp->b_bcount > bp->b_bufsize)
|
||||
panic("ext2_indirtrunc: bad buffer size");
|
||||
bp->b_blkno = dbn;
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_busy_pages(bp, 0);
|
||||
#endif
|
||||
VOP_STRATEGY(bp);
|
||||
error = biowait(bp);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,17 +66,8 @@ ext2_print_dinode( di )
|
|||
printf( "Links: %3d Blockcount: %d\n",
|
||||
di->di_nlink, di->di_blocks);
|
||||
printf( "ctime: 0x%x", di->di_ctime);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_ctime);
|
||||
#endif
|
||||
printf( "atime: 0x%x", di->di_atime);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_atime);
|
||||
#endif
|
||||
printf( "mtime: 0x%x", di->di_mtime);
|
||||
#if !defined(__FreeBSD__)
|
||||
print_time(" -- %s\n", di->di_mtime);
|
||||
#endif
|
||||
printf( "BLOCKS: ");
|
||||
for(i=0; i < (di->di_blocks <= 24 ? ((di->di_blocks+1)/2): 12); i++)
|
||||
printf("%d ", di->di_db[i]);
|
||||
|
|
|
|||
|
|
@ -73,9 +73,7 @@ int ll_w_block(struct buf * bp, int waitfor)
|
|||
bp->b_flags &= ~(B_READ|B_DONE|B_ERROR|B_DELWRI);
|
||||
bp->b_flags |= B_WRITEINPROG;
|
||||
bp->b_vp->v_numoutput++;
|
||||
#if defined(__FreeBSD__)
|
||||
vfs_busy_pages(bp, 1);
|
||||
#endif
|
||||
VOP_STRATEGY(bp);
|
||||
return waitfor ? biowait(bp) : 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,10 +44,6 @@
|
|||
* @(#)ufs_lookup.c 8.6 (Berkeley) 4/1/94
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "diagnostic.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/namei.h>
|
||||
|
|
|
|||
|
|
@ -39,10 +39,6 @@
|
|||
* @(#)ufs_readwrite.c 8.7 (Berkeley) 1/21/94
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "diagnostic.h"
|
||||
#endif
|
||||
|
||||
#define BLKSIZE(a, b, c) blksize(a, b, c)
|
||||
#define FS struct ext2_sb_info
|
||||
#define I_FS i_e2fs
|
||||
|
|
@ -146,11 +142,6 @@ READ(ap)
|
|||
uiomove((char *)bp->b_data + blkoffset, (int)xfersize, uio);
|
||||
if (error)
|
||||
break;
|
||||
#if !defined(__FreeBSD__)
|
||||
if (S_ISREG(mode) && (xfersize + blkoffset == fs->s_frag_size ||
|
||||
uio->uio_offset == ip->i_size))
|
||||
bp->b_flags |= B_AGE;
|
||||
#endif
|
||||
|
||||
bqrelse(bp);
|
||||
}
|
||||
|
|
@ -240,10 +231,8 @@ WRITE(ap)
|
|||
if (uio->uio_resid < xfersize)
|
||||
xfersize = uio->uio_resid;
|
||||
|
||||
#if defined(__FreeBSD__)
|
||||
if (uio->uio_offset + xfersize > ip->i_size)
|
||||
vnode_pager_setsize(vp, uio->uio_offset + xfersize);
|
||||
#endif
|
||||
|
||||
if (fs->s_frag_size > xfersize)
|
||||
flags |= B_CLRBUF;
|
||||
|
|
@ -257,13 +246,7 @@ WRITE(ap)
|
|||
|
||||
if (uio->uio_offset + xfersize > ip->i_size) {
|
||||
ip->i_size = uio->uio_offset + xfersize;
|
||||
#if !defined(__FreeBSD__)
|
||||
vnode_pager_setsize(vp, (u_long)ip->i_size);
|
||||
#endif
|
||||
}
|
||||
#if !defined(__FreeBSD__)
|
||||
(void)vnode_pager_uncache(vp);
|
||||
#endif
|
||||
|
||||
size = BLKSIZE(fs, ip, lbn) - bp->b_resid;
|
||||
if (size < xfersize)
|
||||
|
|
@ -278,20 +261,13 @@ WRITE(ap)
|
|||
(void)bwrite(bp);
|
||||
} else if (xfersize + blkoffset == fs->s_frag_size) {
|
||||
if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERW) == 0) {
|
||||
#if defined(__FreeBSD__)
|
||||
bp->b_flags |= B_CLUSTEROK;
|
||||
#endif
|
||||
cluster_write(bp, ip->i_size);
|
||||
} else {
|
||||
#if !defined(__FreeBSD__)
|
||||
bp->b_flags |= B_AGE;
|
||||
#endif
|
||||
bawrite(bp);
|
||||
}
|
||||
} else {
|
||||
#if defined(__FreeBSD__)
|
||||
bp->b_flags |= B_CLUSTEROK;
|
||||
#endif
|
||||
bdwrite(bp);
|
||||
}
|
||||
if (error || xfersize == 0)
|
||||
|
|
|
|||
|
|
@ -101,13 +101,8 @@ ext2_checkoverlap(bp, ip)
|
|||
if (ep == bp || (ep->b_flags & B_INVAL) ||
|
||||
ep->b_vp == NULLVP)
|
||||
continue;
|
||||
#if !defined(__FreeBSD__)
|
||||
if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0, NULL))
|
||||
continue;
|
||||
#else
|
||||
if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0, NULL, NULL))
|
||||
continue;
|
||||
#endif
|
||||
if (vp != ip->i_devvp)
|
||||
continue;
|
||||
/* look for overlap */
|
||||
|
|
|
|||
|
|
@ -39,11 +39,7 @@
|
|||
* @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94
|
||||
*/
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "quota.h"
|
||||
#else
|
||||
#include "opt_quota.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -102,16 +98,12 @@ static struct vfsops ext2fs_vfsops = {
|
|||
ext2_init,
|
||||
};
|
||||
|
||||
#if defined(__FreeBSD__)
|
||||
VFS_SET(ext2fs_vfsops, ext2fs, MOUNT_EXT2FS, 0);
|
||||
#define bsd_malloc malloc
|
||||
#define bsd_free free
|
||||
#endif
|
||||
|
||||
extern u_long nextgennumber;
|
||||
#ifdef __FreeBSD__
|
||||
static int ext2fs_inode_hash_lock;
|
||||
#endif
|
||||
|
||||
static int compute_sb_data __P((struct vnode * devvp,
|
||||
struct ext2_super_block * es,
|
||||
|
|
@ -130,16 +122,9 @@ static int ext2_mountroot __P((void));
|
|||
static int
|
||||
ext2_mountroot()
|
||||
{
|
||||
#if !defined(__FreeBSD__)
|
||||
extern struct vnode *rootvp;
|
||||
#endif
|
||||
register struct ext2_sb_info *fs;
|
||||
register struct mount *mp;
|
||||
#if defined(__FreeBSD__)
|
||||
struct proc *p = curproc;
|
||||
#else
|
||||
struct proc *p = get_proc(); /* XXX */
|
||||
#endif
|
||||
struct ufsmount *ump;
|
||||
u_int size;
|
||||
int error;
|
||||
|
|
@ -165,11 +150,7 @@ ext2_mountroot()
|
|||
bsd_free(mp, M_MOUNT);
|
||||
return (error);
|
||||
}
|
||||
#if defined(__FreeBSD__)
|
||||
CIRCLEQ_INSERT_HEAD(&mountlist, mp, mnt_list);
|
||||
#else
|
||||
TAILQ_INSERT_TAIL(&mountlist, mp, mnt_list);
|
||||
#endif
|
||||
mp->mnt_flag |= MNT_ROOTFS;
|
||||
mp->mnt_vnodecovered = NULLVP;
|
||||
ump = VFSTOUFS(mp);
|
||||
|
|
@ -571,9 +552,6 @@ ext2_mountfs(devvp, mp, p)
|
|||
int havepart = 0;
|
||||
int error, i, size;
|
||||
int ronly;
|
||||
#if !defined(__FreeBSD__)
|
||||
extern struct vnode *rootvp;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Disallow multiple mounts of the same device.
|
||||
|
|
@ -854,18 +832,11 @@ ext2_sync(mp, waitfor, cred, p)
|
|||
* is still in the buffer cache.
|
||||
*/
|
||||
if (fs->s_dirt) {
|
||||
#if !defined(__FreeBSD__)
|
||||
struct timeval time;
|
||||
#endif
|
||||
|
||||
if (fs->s_rd_only != 0) { /* XXX */
|
||||
printf("fs = %s\n", fs->fs_fsmnt);
|
||||
panic("update: rofs mod");
|
||||
}
|
||||
fs->s_dirt = 0;
|
||||
#if !defined(__FreeBSD__)
|
||||
get_time(&time);
|
||||
#endif
|
||||
fs->s_es->s_wtime = time.tv_sec;
|
||||
allerror = ext2_sbupdate(ump, waitfor);
|
||||
}
|
||||
|
|
@ -933,7 +904,6 @@ restart:
|
|||
if ((*vpp = ufs_ihashget(dev, ino)) != NULL)
|
||||
return (0);
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
/*
|
||||
* Lock out the creation of new entries in the FFS hash table in
|
||||
* case getnewvnode() or MALLOC() blocks, otherwise a duplicate
|
||||
|
|
@ -947,7 +917,6 @@ restart:
|
|||
goto restart;
|
||||
}
|
||||
ext2fs_inode_hash_lock = 1;
|
||||
#endif
|
||||
|
||||
/* Allocate a new vnode/inode. */
|
||||
if (error = getnewvnode(VT_UFS, mp, ext2_vnodeop_p, &vp)) {
|
||||
|
|
@ -955,9 +924,6 @@ restart:
|
|||
return (error);
|
||||
}
|
||||
MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, M_WAITOK);
|
||||
#ifndef __FreeBSD__
|
||||
insmntque(vp, mp);
|
||||
#endif
|
||||
bzero((caddr_t)ip, sizeof(struct inode));
|
||||
vp->v_data = ip;
|
||||
ip->i_vnode = vp;
|
||||
|
|
@ -976,11 +942,9 @@ restart:
|
|||
*/
|
||||
ufs_ihashins(ip);
|
||||
|
||||
#ifdef __FreeBSD__
|
||||
if (ext2fs_inode_hash_lock < 0)
|
||||
wakeup(&ext2fs_inode_hash_lock);
|
||||
ext2fs_inode_hash_lock = 0;
|
||||
#endif
|
||||
|
||||
/* Read in the disk contents for the inode, copy into the inode. */
|
||||
/* Read in the disk contents for the inode, copy into the inode. */
|
||||
|
|
@ -1041,10 +1005,6 @@ printf("ext2_vget(%d) dbn= %d ", ino, fsbtodb(fs, ino_to_fsba(fs, ino)));
|
|||
* already have one. This should only happen on old filesystems.
|
||||
*/
|
||||
if (ip->i_gen == 0) {
|
||||
#if !defined(__FreeBSD__)
|
||||
struct timeval time;
|
||||
get_time(&time);
|
||||
#endif
|
||||
if (++nextgennumber < (u_long)time.tv_sec)
|
||||
nextgennumber = time.tv_sec;
|
||||
ip->i_gen = nextgennumber;
|
||||
|
|
|
|||
|
|
@ -41,11 +41,6 @@
|
|||
|
||||
#include "opt_quota.h"
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include "fifo.h"
|
||||
#include "diagnostic.h"
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/resourcevar.h>
|
||||
|
|
@ -62,11 +57,7 @@
|
|||
#include <vm/vm.h>
|
||||
#include <vm/vm_extern.h>
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#include <ufs/ufs/lockf.h>
|
||||
#else
|
||||
#include <sys/signalvar.h>
|
||||
#endif
|
||||
#include <ufs/ufs/dir.h>
|
||||
#include <ufs/ufs/quota.h>
|
||||
#include <ufs/ufs/inode.h>
|
||||
|
|
@ -136,11 +127,9 @@ static struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
|
|||
static struct vnodeopv_desc ext2fs_fifoop_opv_desc =
|
||||
{ &ext2_fifoop_p, ext2_fifoop_entries };
|
||||
|
||||
#if defined(__FreeBSD__)
|
||||
VNODEOP_SET(ext2fs_vnodeop_opv_desc);
|
||||
VNODEOP_SET(ext2fs_specop_opv_desc);
|
||||
VNODEOP_SET(ext2fs_fifoop_opv_desc);
|
||||
#endif
|
||||
|
||||
#include <gnu/ext2fs/ext2_readwrite.c>
|
||||
|
||||
|
|
@ -186,13 +175,8 @@ ext2_fsync(ap)
|
|||
int s;
|
||||
|
||||
/*
|
||||
* Clean memory object.
|
||||
* XXX add this to all file systems.
|
||||
* XXX why is all this fs specific?
|
||||
*/
|
||||
#if !defined(__FreeBSD__)
|
||||
vn_pager_sync(vp, ap->a_waitfor);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Flush all dirty buffers associated with a vnode.
|
||||
|
|
@ -223,11 +207,7 @@ loop:
|
|||
if (ap->a_waitfor == MNT_WAIT) {
|
||||
while (vp->v_numoutput) {
|
||||
vp->v_flag |= VBWAIT;
|
||||
#if !defined(__FreeBSD__)
|
||||
sleep((caddr_t)&vp->v_numoutput, PRIBIO + 1);
|
||||
#else
|
||||
tsleep((caddr_t)&vp->v_numoutput, PRIBIO + 1, "extfsn", 0);
|
||||
#endif
|
||||
}
|
||||
#if DIAGNOSTIC
|
||||
if (vp->v_dirtyblkhd.lh_first) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue