[PATCH/RFC] add proc_dir_entry fields to device_node

[Nathan Lynch <nathanl@austin.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 930 bytes --]

Hi-

I am doing some ppc64 work to enable dynamic addition and removal of
nodes in /proc/device-tree.  It seems that recording a node's directory
and symlinks (if any) in the device_node is the easiest way to assure
that a node is cleaned up properly after deletion.

I need to add a few lines to fs/proc/proc_devtree.c::add_node() to
record the proc entries for each node as it is processed.  These will
refer to fields that do not yet exist in ppc's device_node.  I propose
adding these fields to ppc's device_node (patch attached).  If that
comment in prom.h about breaking BootX is still valid, there are
alternatives, but they would likely involve ifdefs and macros.

I have attached the proposed changes in separate patches against linus
2.5 bk.  The proc_devtree patch is for illustration purposes -- the
patch I submit to lkml will make add_node() extern and place its
declaration in the proper header.

Comments?

Nathan

[-- Attachment #2: ppc_device_node.patch --]
[-- Type: text/plain, Size: 680 bytes --]

diff -Nru a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h
--- a/include/asm-ppc/prom.h	Fri Oct  3 10:57:25 2003
+++ b/include/asm-ppc/prom.h	Fri Oct  3 10:57:25 2003
@@ -9,6 +9,7 @@
 #define _PPC_PROM_H

 #include <linux/config.h>
+#include <linux/proc_fs.h>

 typedef void *phandle;
 typedef void *ihandle;
@@ -57,6 +58,9 @@
 	struct	device_node *sibling;
 	struct	device_node *next;	/* next device of same type */
 	struct	device_node *allnext;	/* next in list of all nodes */
+	struct  proc_dir_entry *pde;       /* node's directory */
+	struct  proc_dir_entry *name_link; /* name symlink */
+	struct  proc_dir_entry *addr_link; /* address symlink */
 };

 struct prom_args;

[-- Attachment #3: proc_devtree.patch --]
[-- Type: text/plain, Size: 662 bytes --]

diff -Nru a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
--- a/fs/proc/proc_devtree.c	Fri Oct  3 11:05:05 2003
+++ b/fs/proc/proc_devtree.c	Fri Oct  3 11:05:05 2003
@@ -53,6 +53,7 @@
 	int l;
 	struct proc_dir_entry *list, **lastp, *al;

+	np->pde = de;
 	lastp = &list;
 	for (pp = np->properties; pp != 0; pp = pp->next) {
 		/*
@@ -102,6 +103,7 @@
 			al = proc_symlink(child->name, de, ent->name);
 			if (al == 0)
 				break;
+			child->name_link = al;
 			*lastp = al;
 			lastp = &al->next;
 		}
@@ -112,6 +114,7 @@
 		al = proc_symlink(at, de, ent->name);
 		if (al == 0)
 			break;
+		child->addr_link = al;
 		*lastp = al;
 		lastp = &al->next;
 	}