mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-16 10:20:30 +00:00
Make non-SOFTUPDATES kernels compile again.
Integrate the stubfile into the main file now that license issues have been long resolved.
This commit is contained in:
Poul-Henning Kamp
parent
d74c567254
commit
1121c39497
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=141685
@ -1689,8 +1689,7 @@ ufs/ffs/ffs_alloc.c optional ffs
|
||||
ufs/ffs/ffs_balloc.c optional ffs
|
||||
ufs/ffs/ffs_inode.c optional ffs
|
||||
ufs/ffs/ffs_snapshot.c optional ffs
|
||||
ufs/ffs/ffs_softdep.c optional softupdates ffs
|
||||
ufs/ffs/ffs_softdep_stub.c optional ffs
|
||||
ufs/ffs/ffs_softdep.c optional ffs
|
||||
ufs/ffs/ffs_subr.c optional ffs
|
||||
ufs/ffs/ffs_tables.c optional ffs
|
||||
ufs/ffs/ffs_vfsops.c optional ffs
|
||||
|
||||
@ -76,6 +76,273 @@ __FBSDID("$FreeBSD$");
|
||||
#include <ufs/ffs/ffs_extern.h>
|
||||
#include <ufs/ufs/ufs_extern.h>
|
||||
|
||||
#include "opt_ffs.h"
|
||||
|
||||
#ifndef SOFTUPDATES
|
||||
|
||||
int
|
||||
softdep_flushfiles(oldmnt, flags, td)
|
||||
struct mount *oldmnt;
|
||||
int flags;
|
||||
struct thread *td;
|
||||
{
|
||||
|
||||
panic("softdep_flushfiles called");
|
||||
}
|
||||
|
||||
int
|
||||
softdep_mount(devvp, mp, fs, cred)
|
||||
struct vnode *devvp;
|
||||
struct mount *mp;
|
||||
struct fs *fs;
|
||||
struct ucred *cred;
|
||||
{
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
softdep_initialize()
|
||||
{
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
softdep_uninitialize()
|
||||
{
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_inomapdep(bp, ip, newinum)
|
||||
struct buf *bp;
|
||||
struct inode *ip;
|
||||
ino_t newinum;
|
||||
{
|
||||
|
||||
panic("softdep_setup_inomapdep called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_blkmapdep(bp, fs, newblkno)
|
||||
struct buf *bp;
|
||||
struct fs *fs;
|
||||
ufs2_daddr_t newblkno;
|
||||
{
|
||||
|
||||
panic("softdep_setup_blkmapdep called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_allocdirect(ip, lbn, newblkno, oldblkno, newsize, oldsize, bp)
|
||||
struct inode *ip;
|
||||
ufs_lbn_t lbn;
|
||||
ufs2_daddr_t newblkno;
|
||||
ufs2_daddr_t oldblkno;
|
||||
long newsize;
|
||||
long oldsize;
|
||||
struct buf *bp;
|
||||
{
|
||||
|
||||
panic("softdep_setup_allocdirect called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_allocext(ip, lbn, newblkno, oldblkno, newsize, oldsize, bp)
|
||||
struct inode *ip;
|
||||
ufs_lbn_t lbn;
|
||||
ufs2_daddr_t newblkno;
|
||||
ufs2_daddr_t oldblkno;
|
||||
long newsize;
|
||||
long oldsize;
|
||||
struct buf *bp;
|
||||
{
|
||||
|
||||
panic("softdep_setup_allocdirect called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_allocindir_page(ip, lbn, bp, ptrno, newblkno, oldblkno, nbp)
|
||||
struct inode *ip;
|
||||
ufs_lbn_t lbn;
|
||||
struct buf *bp;
|
||||
int ptrno;
|
||||
ufs2_daddr_t newblkno;
|
||||
ufs2_daddr_t oldblkno;
|
||||
struct buf *nbp;
|
||||
{
|
||||
|
||||
panic("softdep_setup_allocindir_page called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_allocindir_meta(nbp, ip, bp, ptrno, newblkno)
|
||||
struct buf *nbp;
|
||||
struct inode *ip;
|
||||
struct buf *bp;
|
||||
int ptrno;
|
||||
ufs2_daddr_t newblkno;
|
||||
{
|
||||
|
||||
panic("softdep_setup_allocindir_meta called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_freeblocks(ip, length, flags)
|
||||
struct inode *ip;
|
||||
off_t length;
|
||||
int flags;
|
||||
{
|
||||
|
||||
panic("softdep_setup_freeblocks called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_freefile(pvp, ino, mode)
|
||||
struct vnode *pvp;
|
||||
ino_t ino;
|
||||
int mode;
|
||||
{
|
||||
|
||||
panic("softdep_freefile called");
|
||||
}
|
||||
|
||||
int
|
||||
softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp, isnewblk)
|
||||
struct buf *bp;
|
||||
struct inode *dp;
|
||||
off_t diroffset;
|
||||
ino_t newinum;
|
||||
struct buf *newdirbp;
|
||||
int isnewblk;
|
||||
{
|
||||
|
||||
panic("softdep_setup_directory_add called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_change_directoryentry_offset(dp, base, oldloc, newloc, entrysize)
|
||||
struct inode *dp;
|
||||
caddr_t base;
|
||||
caddr_t oldloc;
|
||||
caddr_t newloc;
|
||||
int entrysize;
|
||||
{
|
||||
|
||||
panic("softdep_change_directoryentry_offset called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_remove(bp, dp, ip, isrmdir)
|
||||
struct buf *bp;
|
||||
struct inode *dp;
|
||||
struct inode *ip;
|
||||
int isrmdir;
|
||||
{
|
||||
|
||||
panic("softdep_setup_remove called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_directory_change(bp, dp, ip, newinum, isrmdir)
|
||||
struct buf *bp;
|
||||
struct inode *dp;
|
||||
struct inode *ip;
|
||||
ino_t newinum;
|
||||
int isrmdir;
|
||||
{
|
||||
|
||||
panic("softdep_setup_directory_change called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_change_linkcnt(ip)
|
||||
struct inode *ip;
|
||||
{
|
||||
|
||||
panic("softdep_change_linkcnt called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_load_inodeblock(ip)
|
||||
struct inode *ip;
|
||||
{
|
||||
|
||||
panic("softdep_load_inodeblock called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_update_inodeblock(ip, bp, waitfor)
|
||||
struct inode *ip;
|
||||
struct buf *bp;
|
||||
int waitfor;
|
||||
{
|
||||
|
||||
panic("softdep_update_inodeblock called");
|
||||
}
|
||||
|
||||
int
|
||||
softdep_fsync(vp)
|
||||
struct vnode *vp; /* the "in_core" copy of the inode */
|
||||
{
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
softdep_fsync_mountdev(vp)
|
||||
struct vnode *vp;
|
||||
{
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
int
|
||||
softdep_flushworklist(oldmnt, countp, td)
|
||||
struct mount *oldmnt;
|
||||
int *countp;
|
||||
struct thread *td;
|
||||
{
|
||||
|
||||
*countp = 0;
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
softdep_sync_metadata(struct vnode *vp)
|
||||
{
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
softdep_slowdown(vp)
|
||||
struct vnode *vp;
|
||||
{
|
||||
|
||||
panic("softdep_slowdown called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_releasefile(ip)
|
||||
struct inode *ip; /* inode with the zero effective link count */
|
||||
{
|
||||
|
||||
panic("softdep_releasefile called");
|
||||
}
|
||||
|
||||
int
|
||||
softdep_request_cleanup(fs, vp)
|
||||
struct fs *fs;
|
||||
struct vnode *vp;
|
||||
{
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
#else
|
||||
/*
|
||||
* These definitions need to be adapted to the system to which
|
||||
* this file is being ported.
|
||||
@ -5647,3 +5914,5 @@ softdep_error(func, error)
|
||||
/* XXX should do something better! */
|
||||
printf("%s: got error %d while accessing filesystem\n", func, error);
|
||||
}
|
||||
|
||||
#endif /* SOFTUPDATES */
|
||||
|
||||
@ -1,317 +0,0 @@
|
||||
/*-
|
||||
* Copyright 1998 Marshall Kirk McKusick. All Rights Reserved.
|
||||
*
|
||||
* The soft updates code is derived from the appendix of a University
|
||||
* of Michigan technical report (Gregory R. Ganger and Yale N. Patt,
|
||||
* "Soft Updates: A Solution to the Metadata Update Problem in File
|
||||
* Systems", CSE-TR-254-95, August 1995).
|
||||
*
|
||||
* 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. None of the names of McKusick, Ganger, or the University of Michigan
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY MARSHALL KIRK MCKUSICK ``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 MARSHALL KIRK MCKUSICK 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.
|
||||
*
|
||||
* from: @(#)ffs_softdep_stub.c 9.1 (McKusick) 7/10/97
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
/*
|
||||
* Use this file as ffs_softdep.c if you do not wish the real ffs_softdep.c
|
||||
* to be included in your system. (e.g for legal reasons )
|
||||
* The real files are in /usr/src/contrib/sys/softupdates.
|
||||
* You must copy them here before you can use soft updates.
|
||||
* Read the README for legal and technical information.
|
||||
*/
|
||||
|
||||
#include "opt_ffs.h"
|
||||
#if (SOFTUPDATES == 0 ) /* SOFTUPDATES not configured in, use these stubs. */
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/vnode.h>
|
||||
#include <sys/mount.h>
|
||||
#include <ufs/ufs/quota.h>
|
||||
#include <ufs/ufs/inode.h>
|
||||
#include <ufs/ffs/ffs_extern.h>
|
||||
#include <ufs/ufs/ufs_extern.h>
|
||||
|
||||
int
|
||||
softdep_flushfiles(oldmnt, flags, td)
|
||||
struct mount *oldmnt;
|
||||
int flags;
|
||||
struct thread *td;
|
||||
{
|
||||
|
||||
panic("softdep_flushfiles called");
|
||||
}
|
||||
|
||||
int
|
||||
softdep_mount(devvp, mp, fs, cred)
|
||||
struct vnode *devvp;
|
||||
struct mount *mp;
|
||||
struct fs *fs;
|
||||
struct ucred *cred;
|
||||
{
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
softdep_initialize()
|
||||
{
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
softdep_uninitialize()
|
||||
{
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_inomapdep(bp, ip, newinum)
|
||||
struct buf *bp;
|
||||
struct inode *ip;
|
||||
ino_t newinum;
|
||||
{
|
||||
|
||||
panic("softdep_setup_inomapdep called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_blkmapdep(bp, fs, newblkno)
|
||||
struct buf *bp;
|
||||
struct fs *fs;
|
||||
ufs2_daddr_t newblkno;
|
||||
{
|
||||
|
||||
panic("softdep_setup_blkmapdep called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_allocdirect(ip, lbn, newblkno, oldblkno, newsize, oldsize, bp)
|
||||
struct inode *ip;
|
||||
ufs_lbn_t lbn;
|
||||
ufs2_daddr_t newblkno;
|
||||
ufs2_daddr_t oldblkno;
|
||||
long newsize;
|
||||
long oldsize;
|
||||
struct buf *bp;
|
||||
{
|
||||
|
||||
panic("softdep_setup_allocdirect called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_allocext(ip, lbn, newblkno, oldblkno, newsize, oldsize, bp)
|
||||
struct inode *ip;
|
||||
ufs_lbn_t lbn;
|
||||
ufs2_daddr_t newblkno;
|
||||
ufs2_daddr_t oldblkno;
|
||||
long newsize;
|
||||
long oldsize;
|
||||
struct buf *bp;
|
||||
{
|
||||
|
||||
panic("softdep_setup_allocdirect called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_allocindir_page(ip, lbn, bp, ptrno, newblkno, oldblkno, nbp)
|
||||
struct inode *ip;
|
||||
ufs_lbn_t lbn;
|
||||
struct buf *bp;
|
||||
int ptrno;
|
||||
ufs2_daddr_t newblkno;
|
||||
ufs2_daddr_t oldblkno;
|
||||
struct buf *nbp;
|
||||
{
|
||||
|
||||
panic("softdep_setup_allocindir_page called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_allocindir_meta(nbp, ip, bp, ptrno, newblkno)
|
||||
struct buf *nbp;
|
||||
struct inode *ip;
|
||||
struct buf *bp;
|
||||
int ptrno;
|
||||
ufs2_daddr_t newblkno;
|
||||
{
|
||||
|
||||
panic("softdep_setup_allocindir_meta called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_freeblocks(ip, length, flags)
|
||||
struct inode *ip;
|
||||
off_t length;
|
||||
int flags;
|
||||
{
|
||||
|
||||
panic("softdep_setup_freeblocks called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_freefile(pvp, ino, mode)
|
||||
struct vnode *pvp;
|
||||
ino_t ino;
|
||||
int mode;
|
||||
{
|
||||
|
||||
panic("softdep_freefile called");
|
||||
}
|
||||
|
||||
int
|
||||
softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp, isnewblk)
|
||||
struct buf *bp;
|
||||
struct inode *dp;
|
||||
off_t diroffset;
|
||||
ino_t newinum;
|
||||
struct buf *newdirbp;
|
||||
int isnewblk;
|
||||
{
|
||||
|
||||
panic("softdep_setup_directory_add called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_change_directoryentry_offset(dp, base, oldloc, newloc, entrysize)
|
||||
struct inode *dp;
|
||||
caddr_t base;
|
||||
caddr_t oldloc;
|
||||
caddr_t newloc;
|
||||
int entrysize;
|
||||
{
|
||||
|
||||
panic("softdep_change_directoryentry_offset called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_remove(bp, dp, ip, isrmdir)
|
||||
struct buf *bp;
|
||||
struct inode *dp;
|
||||
struct inode *ip;
|
||||
int isrmdir;
|
||||
{
|
||||
|
||||
panic("softdep_setup_remove called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_setup_directory_change(bp, dp, ip, newinum, isrmdir)
|
||||
struct buf *bp;
|
||||
struct inode *dp;
|
||||
struct inode *ip;
|
||||
ino_t newinum;
|
||||
int isrmdir;
|
||||
{
|
||||
|
||||
panic("softdep_setup_directory_change called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_change_linkcnt(ip)
|
||||
struct inode *ip;
|
||||
{
|
||||
|
||||
panic("softdep_change_linkcnt called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_load_inodeblock(ip)
|
||||
struct inode *ip;
|
||||
{
|
||||
|
||||
panic("softdep_load_inodeblock called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_update_inodeblock(ip, bp, waitfor)
|
||||
struct inode *ip;
|
||||
struct buf *bp;
|
||||
int waitfor;
|
||||
{
|
||||
|
||||
panic("softdep_update_inodeblock called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_fsync_mountdev(vp)
|
||||
struct vnode *vp;
|
||||
{
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
int
|
||||
softdep_flushworklist(oldmnt, countp, td)
|
||||
struct mount *oldmnt;
|
||||
int *countp;
|
||||
struct thread *td;
|
||||
{
|
||||
|
||||
*countp = 0;
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
softdep_sync_metadata(ap)
|
||||
struct vop_fsync_args /* {
|
||||
struct vnode *a_vp;
|
||||
struct ucred *a_cred;
|
||||
int a_waitfor;
|
||||
struct thread *a_td;
|
||||
} */ *ap;
|
||||
{
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
softdep_slowdown(vp)
|
||||
struct vnode *vp;
|
||||
{
|
||||
|
||||
panic("softdep_slowdown called");
|
||||
}
|
||||
|
||||
void
|
||||
softdep_releasefile(ip)
|
||||
struct inode *ip; /* inode with the zero effective link count */
|
||||
{
|
||||
|
||||
panic("softdep_releasefile called");
|
||||
}
|
||||
|
||||
int
|
||||
softdep_request_cleanup(fs, vp)
|
||||
struct fs *fs;
|
||||
struct vnode *vp;
|
||||
{
|
||||
|
||||
return (0);
|
||||
}
|
||||
#endif /* SOFTUPDATES not configured in */
|
||||
Loading…
Reference in New Issue
Block a user