summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1997-09-26 08:08:58 +0000
committerphk <phk@FreeBSD.org>1997-09-26 08:08:58 +0000
commit3783a8767ec4fcca473f8cc20650c729ee15e291 (patch)
tree256547237863f7093c823adb427e5961091fd814
parentf5b2fcb0c6f815432425d9ea40997a1fbf5e5ad0 (diff)
downloadFreeBSD-src-3783a8767ec4fcca473f8cc20650c729ee15e291.zip
FreeBSD-src-3783a8767ec4fcca473f8cc20650c729ee15e291.tar.gz
I lost a bit of my change in the last commit, this is more like it.
Noticed by: bde
-rw-r--r--sys/kern/vfs_export.c7
-rw-r--r--sys/kern/vfs_subr.c7
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 5325542..b217747 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.105 1997/09/24 07:46:53 phk Exp $
+ * $Id: vfs_subr.c,v 1.106 1997/09/25 16:17:57 phk Exp $
*/
/*
@@ -354,7 +354,10 @@ getnewvnode(tag, mp, vops, vpp)
if (wantfreevnodes && freevnodes < wantfreevnodes) {
vp = NULL;
- } else if (freevnodes <= desiredvnodes) {
+ } else if (!wantfreevnodes && freevnodes <= desiredvnodes) {
+ /*
+ * XXX: this is only here to be backwards compatible
+ */
vp = NULL;
} else {
TAILQ_FOREACH(vp, &vnode_free_list, v_freelist) {
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 5325542..b217747 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.105 1997/09/24 07:46:53 phk Exp $
+ * $Id: vfs_subr.c,v 1.106 1997/09/25 16:17:57 phk Exp $
*/
/*
@@ -354,7 +354,10 @@ getnewvnode(tag, mp, vops, vpp)
if (wantfreevnodes && freevnodes < wantfreevnodes) {
vp = NULL;
- } else if (freevnodes <= desiredvnodes) {
+ } else if (!wantfreevnodes && freevnodes <= desiredvnodes) {
+ /*
+ * XXX: this is only here to be backwards compatible
+ */
vp = NULL;
} else {
TAILQ_FOREACH(vp, &vnode_free_list, v_freelist) {
OpenPOWER on IntegriCloud