aboutsummaryrefslogtreecommitdiff
path: root/sys/miscfs/specfs
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1998-09-12 20:21:54 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1998-09-12 20:21:54 +0000
commit649c00db71d1001e26fbaa49da8d158227b113c0 (patch)
tree4729e908f1f12bab5d5f1542b557a0bca4c7b1dd /sys/miscfs/specfs
parente9291af7484e815a84a34b46303991c8e007d89f (diff)
downloadsrc-649c00db71d1001e26fbaa49da8d158227b113c0.tar.gz
src-649c00db71d1001e26fbaa49da8d158227b113c0.zip
various nits that didn't make it through the brucefilter.
Notes
Notes: svn path=/head/; revision=39111
Diffstat (limited to 'sys/miscfs/specfs')
-rw-r--r--sys/miscfs/specfs/spec_vnops.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 31519d380ed9..f32a9f15033e 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.72 1998/09/04 08:06:56 dfr Exp $
+ * $Id: spec_vnops.c,v 1.73 1998/09/05 14:13:12 phk Exp $
*/
#include <sys/param.h>
@@ -61,7 +61,7 @@ static int spec_advlock __P((struct vop_advlock_args *));
static int spec_badop __P((void));
static int spec_bmap __P((struct vop_bmap_args *));
static int spec_close __P((struct vop_close_args *));
-static void spec_freeblks __P((struct vop_freeblks_args *));
+static int spec_freeblks __P((struct vop_freeblks_args *));
static int spec_fsync __P((struct vop_fsync_args *));
static int spec_getattr __P((struct vop_getattr_args *));
static int spec_getpages __P((struct vop_getpages_args *));
@@ -84,6 +84,7 @@ static struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
{ &vop_bmap_desc, (vop_t *) spec_bmap },
{ &vop_close_desc, (vop_t *) spec_close },
{ &vop_create_desc, (vop_t *) spec_badop },
+ { &vop_freeblks_desc, (vop_t *) spec_freeblks },
{ &vop_fsync_desc, (vop_t *) spec_fsync },
{ &vop_getattr_desc, (vop_t *) spec_getattr },
{ &vop_getpages_desc, (vop_t *) spec_getpages },
@@ -110,7 +111,6 @@ static struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
{ &vop_strategy_desc, (vop_t *) spec_strategy },
{ &vop_symlink_desc, (vop_t *) spec_badop },
{ &vop_write_desc, (vop_t *) spec_write },
- { &vop_freeblks_desc, (vop_t *) spec_freeblks },
{ NULL, NULL }
};
static struct vnodeopv_desc spec_vnodeop_opv_desc =
@@ -542,7 +542,7 @@ spec_strategy(ap)
return (0);
}
-static void
+static int
spec_freeblks(ap)
struct vop_freeblks_args /* {
struct vnode *a_vp;
@@ -555,7 +555,7 @@ spec_freeblks(ap)
bsw = bdevsw[major(ap->a_vp->v_rdev)];
if ((bsw->d_flags & D_CANFREE) == 0)
- return;
+ return (0);
bp = geteblk(ap->a_length);
bp->b_flags |= B_FREEBUF | B_BUSY;
bp->b_dev = ap->a_vp->v_rdev;
@@ -563,6 +563,7 @@ spec_freeblks(ap)
bp->b_offset = dbtob(ap->a_addr);
bp->b_bcount = ap->a_length;
(*bsw->d_strategy)(bp);
+ return (0);
}
/*