summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2001-01-23 22:37:30 +0000
committerjhb <jhb@FreeBSD.org>2001-01-23 22:37:30 +0000
commitc55210afc563c7d266b94a9ca5e3c1e8259acd75 (patch)
tree0e8f08ba03b07ff6fbd4224c439af8d0ca802829 /sys/fs
parentfe7d8cee8f1c508cfe426ea5c180cd0c43d08664 (diff)
downloadFreeBSD-src-c55210afc563c7d266b94a9ca5e3c1e8259acd75.zip
FreeBSD-src-c55210afc563c7d266b94a9ca5e3c1e8259acd75.tar.gz
- FreeBSD doesn't have an abortop vnop as far as I can tell, so #ifdef
references to the hpf op out. - Remove a lockdestroy() on a non-existent variable.
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/hpfs/hpfs_vnops.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index 71b5ad5..2a378c2 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -86,12 +86,13 @@ static int hpfs_readdir __P((struct vop_readdir_args *ap));
static int hpfs_lookup __P((struct vop_lookup_args *ap));
static int hpfs_create __P((struct vop_create_args *));
static int hpfs_remove __P((struct vop_remove_args *));
-static int hpfs_abortop __P((struct vop_abortop_args *));
static int hpfs_bmap __P((struct vop_bmap_args *ap));
#if defined(__FreeBSD__)
static int hpfs_getpages __P((struct vop_getpages_args *ap));
static int hpfs_putpages __P((struct vop_putpages_args *));
static int hpfs_fsync __P((struct vop_fsync_args *ap));
+#else
+static int hpfs_abortop __P((struct vop_abortop_args *));
#endif
static int hpfs_pathconf __P((struct vop_pathconf_args *ap));
@@ -698,8 +699,6 @@ hpfs_reclaim(ap)
hp->h_devvp = NULL;
}
- lockdestroy(&hp->hlock);
-
vp->v_data = NULL;
FREE(hp, M_HPFSNO);
@@ -1343,7 +1342,6 @@ struct vnodeopv_entry_desc hpfs_vnodeop_entries[] = {
{ &vop_print_desc, (vop_t *)hpfs_print },
{ &vop_create_desc, (vop_t *)hpfs_create },
{ &vop_remove_desc, (vop_t *)hpfs_remove },
- { &vop_abortop_desc, (vop_t *)hpfs_abortop },
{ &vop_islocked_desc, (vop_t *)vop_stdislocked },
{ &vop_unlock_desc, (vop_t *)vop_stdunlock },
{ &vop_lock_desc, (vop_t *)vop_stdlock },
OpenPOWER on IntegriCloud