diff options
| author | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 1998-11-12 04:30:04 +0000 |
|---|---|---|
| committer | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 1998-11-12 04:30:04 +0000 |
| commit | 0a12e173ebc48873aa6964dd3a91bf32635e5a67 (patch) | |
| tree | dd60cd68eab27eaec9bf1dd1f4fd2d518eac6bb2 /sys/ufs/ffs/ffs_vnops.c | |
| parent | e2bcb0a0f821ee6e693b46fb23b1e9cf47e1e0c7 (diff) | |
Integrate latest soft updates patches for McKusick.
Integrate cleaner ffs mount code from FreeBSD. Most notably, this mount
code prevents you from mounting an unclean file system read-write.
Diffstat (limited to 'sys/ufs/ffs/ffs_vnops.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_vnops.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 6224aad25a0..52f027086fb 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vnops.c,v 1.7 1998/08/06 19:35:07 csapuntz Exp $ */ +/* $OpenBSD: ffs_vnops.c,v 1.8 1998/11/12 04:30:02 csapuntz Exp $ */ /* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */ /* @@ -157,6 +157,7 @@ struct vnodeopv_entry_desc ffs_specop_entries[] = { { &vop_islocked_desc, ufs_islocked }, /* islocked */ { &vop_pathconf_desc, spec_pathconf }, /* pathconf */ { &vop_advlock_desc, spec_advlock }, /* advlock */ + { &vop_vfree_desc, ffs_vfree }, /* vfree */ { &vop_blkatoff_desc, spec_blkatoff }, /* blkatoff */ { &vop_valloc_desc, spec_valloc }, /* valloc */ { &vop_reallocblks_desc, spec_reallocblks }, /* reallocblks */ @@ -209,6 +210,7 @@ struct vnodeopv_entry_desc ffs_fifoop_entries[] = { { &vop_islocked_desc, ufs_islocked }, /* islocked */ { &vop_pathconf_desc, fifo_pathconf }, /* pathconf */ { &vop_advlock_desc, fifo_advlock }, /* advlock */ + { &vop_vfree_desc, ffs_vfree }, /* vfree */ { &vop_blkatoff_desc, fifo_blkatoff }, /* blkatoff */ { &vop_valloc_desc, fifo_valloc }, /* valloc */ { &vop_reallocblks_desc, fifo_reallocblks }, /* reallocblks */ @@ -318,10 +320,7 @@ loop2: } splx(s); TIMEVAL_TO_TIMESPEC(&time, &ts); - if ((error = VOP_UPDATE(vp, &ts, &ts, ap->a_waitfor == MNT_WAIT)) != 0) return (error); - if (DOINGSOFTDEP(vp) && ap->a_waitfor == MNT_WAIT) - error = softdep_fsync(vp); - return (error); + return (VOP_UPDATE(vp, &ts, &ts, ap->a_waitfor == MNT_WAIT)); } /* |