Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove obvious incorrect assert() from doreclaim() and remove the

Browse Source 
whole PSN_NUKED bit - it's not very useful because of the noref setback.
This commit is contained in:
pooka 2007-05-18 18:00:07 +00:00
parent f98f18ebad
commit 423fa255c6
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/puffs/mount_psshfs/node.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: node.c,v 1.28 2007/05/18 16:13:47 pooka Exp $ */
/* $NetBSD: node.c,v 1.29 2007/05/18 18:00:07 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: node.c,v 1.28 2007/05/18 16:13:47 pooka Exp $");
__RCSID("$NetBSD: node.c,v 1.29 2007/05/18 18:00:07 pooka Exp $");
#endif /* !lint */
#include <assert.h>
@ -272,10 +272,7 @@ psshfs_node_inactive(struct puffs_cc *pcc, void *opc, pid_t pid, int *refcount)
}
out:
if (psn->stat & PSN_NUKED)
*refcount = 0;
else
*refcount = 1;
*refcount = 1;
return 0;
}

3
usr.sbin/puffs/mount_psshfs/psshfs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: psshfs.h,v 1.16 2007/05/18 16:13:47 pooka Exp $ */
/* $NetBSD: psshfs.h,v 1.17 2007/05/18 18:00:07 pooka Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@ -123,7 +123,6 @@ struct psshfs_node {
};
#define PSN_RECLAIMED 0x01
#define PSN_HASFH 0x02
#define PSN_NUKED 0x04
struct psshfs_ctx {
int sshfd;

8
usr.sbin/puffs/mount_psshfs/subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr.c,v 1.19 2007/05/18 16:13:47 pooka Exp $ */
/* $NetBSD: subr.c,v 1.20 2007/05/18 18:00:07 pooka Exp $ */
/*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: subr.c,v 1.19 2007/05/18 16:13:47 pooka Exp $");
__RCSID("$NetBSD: subr.c,v 1.20 2007/05/18 18:00:07 pooka Exp $");
#endif /* !lint */
#include <assert.h>
@ -423,8 +423,6 @@ doreclaim(struct puffs_node *pn)
struct psshfs_node *psn_parent;
struct psshfs_dir *dent;
assert(psn->stat & PSN_NUKED);
psn_parent = psn->parent->pn_data;
psn_parent->childcount--;
@ -458,8 +456,6 @@ nukenode(struct puffs_node *node, const char *entryname, int reclaim)
free(pd->entryname);
pd->entryname = NULL;
psn->stat |= PSN_NUKED;
if (node->pn_va.va_type == VDIR)
psn->parent->pn_va.va_nlink--;