Page MenuHomeFreeBSD
Files F151676654

D50669.id156514.diff
No OneTemporary
Actions

D50669.id156514.diff
View Options

diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c
--- a/sys/fs/pseudofs/pseudofs.c
+++ b/sys/fs/pseudofs/pseudofs.c
@@ -98,12 +98,10 @@
/*
* Add a node to a directory
*/
-static void
+static int
pfs_add_node(struct pfs_node *parent, struct pfs_node *pn)
{
-#ifdef INVARIANTS
struct pfs_node *iter;
-#endif
KASSERT(parent != NULL,
("%s(): parent is NULL", __func__));
@@ -123,9 +121,6 @@
KASSERT(iter->pn_type != pfstype_procdir,
("%s(): nested process directories", __func__));
for (iter = parent->pn_nodes; iter != NULL; iter = iter->pn_next) {
- KASSERT(strcmp(pn->pn_name, iter->pn_name) != 0,
- ("%s(): homonymous siblings: '%s' type %d", __func__,
- pn->pn_name, pn->pn_type));
if (pn->pn_type == pfstype_procdir)
KASSERT(iter->pn_type != pfstype_procdir,
("%s(): sibling process directories", __func__));
@@ -134,8 +129,19 @@
pn->pn_parent = parent;
pfs_fileno_alloc(pn);
-
pfs_lock(parent);
+ for (iter = parent->pn_nodes; iter != NULL; iter = iter->pn_next) {
+ if (strcmp(pn->pn_name, iter->pn_name) != 0)
+ continue;
+ printf("pfs_add_node: homonymous siblings: '%s/%s' type %d",
+ parent->pn_name, pn->pn_name, pn->pn_type);
+ /* not detach, because we are not yet attached */
+ pn->pn_parent = NULL;
+ pfs_unlock(parent);
+ return (EEXIST);
+ }
+
+
if ((parent->pn_flags & PFS_PROCDEP) != 0)
pn->pn_flags |= PFS_PROCDEP;
if (parent->pn_nodes == NULL) {
@@ -152,10 +158,11 @@
parent->pn_last_node = pn;
}
pfs_unlock(parent);
+ return (0);
}
/*
- * Detach a node from its aprent
+ * Detach a node from its parent
*/
static void
pfs_detach_node(struct pfs_node *pn)
@@ -197,6 +204,7 @@
pfs_fixup_dir_flags(struct pfs_node *parent, int flags)
{
struct pfs_node *dot, *dotdot;
+ int rc;
dot = pfs_alloc_node_flags(parent->pn_info, ".", pfstype_this, flags);
if (dot == NULL)
@@ -206,9 +214,14 @@
pfs_destroy(dot);
return (ENOMEM);
}
- pfs_add_node(parent, dot);
- pfs_add_node(parent, dotdot);
- return (0);
+ rc = pfs_add_node(parent, dot);
+ if (rc == 0)
+ rc = pfs_add_node(parent, dotdot);
+ if (rc != 0) {
+ pfs_destroy(dot);
+ pfs_destroy(dotdot);
+ }
+ return (rc);
}
static void
@@ -237,11 +250,12 @@
pn->pn_vis = vis;
pn->pn_destroy = destroy;
pn->pn_flags = flags;
- pfs_add_node(parent, pn);
- rc = pfs_fixup_dir_flags(pn, flags);
- if (rc) {
+ rc = pfs_add_node(parent, pn);
+ if (rc == 0)
+ rc = pfs_fixup_dir_flags(pn, flags);
+ if (rc != 0) {
pfs_destroy(pn);
- return (NULL);
+ pn = NULL;
}
return (pn);
}
@@ -264,8 +278,10 @@
pn->pn_vis = vis;
pn->pn_destroy = destroy;
pn->pn_flags = flags;
- pfs_add_node(parent, pn);
-
+ if (pfs_add_node(parent, pn) != 0) {
+ pfs_destroy(pn);
+ pn = NULL;
+ }
return (pn);
}
@@ -287,7 +303,10 @@
pn->pn_vis = vis;
pn->pn_destroy = destroy;
pn->pn_flags = flags;
- pfs_add_node(parent, pn);
+ if (pfs_add_node(parent, pn) != 0) {
+ pfs_destroy(pn);
+ pn = NULL;
+ }
return (pn);
}

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 10, 11:04 PM (15 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31252072
Default Alt Text
D50669.id156514.diff (2 KB)

Event Timeline