From cdcf0a329f83b6f31d60944308c25553bbfe457d Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Tue, 2 Mar 2004 05:46:02 +0000 Subject: silly fifos aren't a real fs, so we have to be sure to call reclaim in the host fs. --- sys/ufs/ffs/ffs_extern.h | 3 ++- sys/ufs/ffs/ffs_vnops.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'sys/ufs/ffs') diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index 1eb46553dad..b31d6c91c9b 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_extern.h,v 1.22 2004/01/07 20:47:47 tedu Exp $ */ +/* $OpenBSD: ffs_extern.h,v 1.23 2004/03/02 05:46:01 tedu Exp $ */ /* $NetBSD: ffs_extern.h,v 1.4 1996/02/09 22:22:22 christos Exp $ */ /*- @@ -154,6 +154,7 @@ int ffs_read(void *); int ffs_write(void *); int ffs_fsync(void *); int ffs_reclaim(void *); +int ffsfifo_reclaim(void *); /* diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 5c41f97d070..e994cb68c74 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.30 2003/09/23 16:51:13 millert Exp $ */ +/* $OpenBSD: ffs_vnops.c,v 1.31 2004/03/02 05:46:01 tedu Exp $ */ /* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */ /* @@ -150,7 +150,7 @@ struct vnodeopv_entry_desc ffs_fifoop_entries[] = { { &vop_write_desc, ufsfifo_write }, /* write */ { &vop_fsync_desc, ffs_fsync }, /* fsync */ { &vop_inactive_desc, ufs_inactive }, /* inactive */ - { &vop_reclaim_desc, ffs_reclaim }, /* reclaim */ + { &vop_reclaim_desc, ffsfifo_reclaim }, /* reclaim */ { &vop_lock_desc, ufs_lock }, /* lock */ { &vop_unlock_desc, ufs_unlock }, /* unlock */ { &vop_print_desc, ufs_print }, /* print */ @@ -311,3 +311,12 @@ ffs_reclaim(v) vp->v_data = NULL; return (0); } + +#ifdef FIFO +int +ffsfifo_reclaim(void *v) +{ + fifo_reclaim(v); + return (ffs_reclaim(v)); +} +#endif -- cgit v1.2.3