summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2007-03-18 15:05:34 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2007-03-18 15:05:34 +0000
commite1a95c3fd1616145288f44917f513495ddb85829 (patch)
treebdefeec5cfb803587e4c3f148815830eb4655986
parent63ebf3228eaf64fdc80c0cab05548ba8b4d96e04 (diff)
get rid of noop vop_reallocblks; pedro@ miod@ ok
-rw-r--r--sys/msdosfs/denode.h3
-rw-r--r--sys/msdosfs/msdosfs_vnops.c18
-rw-r--r--sys/nfs/nfs_vnops.c3
-rw-r--r--sys/nfs/nfsnode.h4
4 files changed, 4 insertions, 24 deletions
diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h
index dd8d992ce57..7190e8f37df 100644
--- a/sys/msdosfs/denode.h
+++ b/sys/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: denode.h,v 1.19 2007/01/16 17:52:18 thib Exp $ */
+/* $OpenBSD: denode.h,v 1.20 2007/03/18 15:05:33 mickey Exp $ */
/* $NetBSD: denode.h,v 1.24 1997/10/17 11:23:39 ws Exp $ */
/*-
@@ -288,7 +288,6 @@ int msdosfs_strategy(void *);
int msdosfs_print(void *);
int msdosfs_islocked(void *);
int msdosfs_advlock(void *);
-int msdosfs_reallocblks(void *);
int msdosfs_pathconf(void *);
/*
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 3930d00277e..62af2a2dcd9 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msdosfs_vnops.c,v 1.59 2007/01/16 17:52:18 thib Exp $ */
+/* $OpenBSD: msdosfs_vnops.c,v 1.60 2007/03/18 15:05:33 mickey Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */
/*-
@@ -1807,21 +1807,6 @@ msdosfs_bmap(v)
}
int
-msdosfs_reallocblks(v)
- void *v;
-{
-#if 0
- struct vop_reallocblks_args /* {
- struct vnode *a_vp;
- struct cluster_save *a_buflist;
- } */ *ap = v;
-#endif
-
- /* Currently no support for clustering */ /* XXX */
- return (ENOSPC);
-}
-
-int
msdosfs_strategy(v)
void *v;
{
@@ -1999,7 +1984,6 @@ struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
{ &vop_islocked_desc, msdosfs_islocked }, /* islocked */
{ &vop_pathconf_desc, msdosfs_pathconf }, /* pathconf */
{ &vop_advlock_desc, msdosfs_advlock }, /* advlock */
- { &vop_reallocblks_desc, msdosfs_reallocblks }, /* reallocblks */
{ &vop_bwrite_desc, vop_generic_bwrite }, /* bwrite */
{ (struct vnodeop_desc *)NULL, (int (*)(void *))NULL }
};
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 29e2fff5af4..656d0f1fd5f 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_vnops.c,v 1.72 2007/02/23 14:27:06 deraadt Exp $ */
+/* $OpenBSD: nfs_vnops.c,v 1.73 2007/03/18 15:05:33 mickey Exp $ */
/* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */
/*
@@ -122,7 +122,6 @@ struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
{ &vop_islocked_desc, nfs_islocked }, /* islocked */
{ &vop_pathconf_desc, nfs_pathconf }, /* pathconf */
{ &vop_advlock_desc, nfs_advlock }, /* advlock */
- { &vop_reallocblks_desc, nfs_reallocblks }, /* reallocblks */
{ &vop_bwrite_desc, nfs_bwrite },
{ NULL, NULL }
};
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 708218c9518..76a5f5dd90b 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfsnode.h,v 1.23 2007/01/16 17:52:18 thib Exp $ */
+/* $OpenBSD: nfsnode.h,v 1.24 2007/03/18 15:05:33 mickey Exp $ */
/* $NetBSD: nfsnode.h,v 1.16 1996/02/18 11:54:04 fvdl Exp $ */
/*
@@ -207,8 +207,6 @@ int nfs_pathconf(void *);
int nfs_advlock(void *);
int nfs_bwrite(void *);
int nfs_vget(struct mount *, ino_t, struct vnode **);
-#define nfs_reallocblks \
- ((int (*)(void *))eopnotsupp)
/* other stuff */
int nfs_removeit(struct sillyrename *);