Make the two calls from kern/* into softupdates #ifdef SOFTUPDATES,

that is way cleaner than using the softupdates_stub stunt, which
should be killed when convenient.

Discussed with:	mckusick
This commit is contained in:
Poul-Henning Kamp
2000-07-03 13:26:54 +00:00
parent 3d5c4fdcf2
commit 3275cf7379
5 changed files with 12 additions and 15 deletions
+3
View File
@@ -43,6 +43,7 @@
* External virtual filesystem routines * External virtual filesystem routines
*/ */
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_ffs.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@@ -1030,7 +1031,9 @@ sched_sync(void)
/* /*
* Do soft update processing. * Do soft update processing.
*/ */
#ifdef SOFTUPDATES
softdep_process_worklist(NULL); softdep_process_worklist(NULL);
#endif
/* /*
* The variable rushjob allows the kernel to speed up the * The variable rushjob allows the kernel to speed up the
+3
View File
@@ -41,6 +41,7 @@
/* For 4.3 integer FS ID compatibility */ /* For 4.3 integer FS ID compatibility */
#include "opt_compat.h" #include "opt_compat.h"
#include "opt_ffs.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@@ -2541,8 +2542,10 @@ fsync(p, uap)
if (vp->v_object) if (vp->v_object)
vm_object_page_clean(vp->v_object, 0, 0, 0); vm_object_page_clean(vp->v_object, 0, 0, 0);
error = VOP_FSYNC(vp, fp->f_cred, MNT_WAIT, p); error = VOP_FSYNC(vp, fp->f_cred, MNT_WAIT, p);
#ifdef SOFTUPDATES
if (error == 0 && vp->v_mount && (vp->v_mount->mnt_flag & MNT_SOFTDEP)) if (error == 0 && vp->v_mount && (vp->v_mount->mnt_flag & MNT_SOFTDEP))
error = softdep_fsync(vp); error = softdep_fsync(vp);
#endif
VOP_UNLOCK(vp, 0, p); VOP_UNLOCK(vp, 0, p);
return (error); return (error);
+3
View File
@@ -43,6 +43,7 @@
* External virtual filesystem routines * External virtual filesystem routines
*/ */
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_ffs.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@@ -1030,7 +1031,9 @@ sched_sync(void)
/* /*
* Do soft update processing. * Do soft update processing.
*/ */
#ifdef SOFTUPDATES
softdep_process_worklist(NULL); softdep_process_worklist(NULL);
#endif
/* /*
* The variable rushjob allows the kernel to speed up the * The variable rushjob allows the kernel to speed up the
+3
View File
@@ -41,6 +41,7 @@
/* For 4.3 integer FS ID compatibility */ /* For 4.3 integer FS ID compatibility */
#include "opt_compat.h" #include "opt_compat.h"
#include "opt_ffs.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@@ -2541,8 +2542,10 @@ fsync(p, uap)
if (vp->v_object) if (vp->v_object)
vm_object_page_clean(vp->v_object, 0, 0, 0); vm_object_page_clean(vp->v_object, 0, 0, 0);
error = VOP_FSYNC(vp, fp->f_cred, MNT_WAIT, p); error = VOP_FSYNC(vp, fp->f_cred, MNT_WAIT, p);
#ifdef SOFTUPDATES
if (error == 0 && vp->v_mount && (vp->v_mount->mnt_flag & MNT_SOFTDEP)) if (error == 0 && vp->v_mount && (vp->v_mount->mnt_flag & MNT_SOFTDEP))
error = softdep_fsync(vp); error = softdep_fsync(vp);
#endif
VOP_UNLOCK(vp, 0, p); VOP_UNLOCK(vp, 0, p);
return (error); return (error);
-15
View File
@@ -255,19 +255,4 @@ softdep_sync_metadata(ap)
return (0); return (0);
} }
int
softdep_fsync(vp)
struct vnode *vp; /* the "in_core" copy of the inode */
{
return (0);
}
int
softdep_process_worklist(matchmnt)
struct mount *matchmnt;
{
return (0);
}
#endif /* SOFTUPDATES not configured in */ #endif /* SOFTUPDATES not configured in */