[PATCH] pre-libsysfs-0.4.0 patch

I am sending you a pre-release patch. It's everything that's in our
current CVS tree. It adds the functionality you've been looking for. Please
play with this before checking it into your tree, I'd like to know if
it's ok with you or if you find problems. I have tested this out with
test.all and the perl regression test. Let me know what you think.

Still need to do more testing for our work and add some more functions
related to the changes.

I've gone into namedev.c and udev-add.c to make the necessary changes
in line with the library. I have not gone and edited any of the "extras".


Changes:

1) Libsysfs object structures work more as handles now, their included
directories or devices are labeled private. If you need attributes
from a sysfs_class_device, call the available function and don't access
the directory directly. Same holds true for a sysfs_class_device
sysfs_device. Do not access the link directly but call the function
sysfs_get_classdev_device() instead. We only populate entries upon
request, makes things faster and uses less memory.

2) Added sysfs_get_classdev_parent() as requested.

3) Changed getpagesize to sysconf.

4) Added sysfs_refresh_attributes function for refreshing views of
attribute lists. We still need to add refresh for links and subdirs. All
udev needs to do is keep calling sysfs_get_classdev_attr() and that will
internally call the refresh routine.

1 files changed, 7 insertions, 18 deletions

diff --git a/namedev.c b/namedev.c
index 75e4d22370..633a7bf0da 100644
--- a/namedev.c
+++ b/namedev.c
@@ -552,37 +552,29 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 	struct sysfs_device *sysfs_device = NULL;
 	struct sysfs_class_device *class_dev_parent = NULL;
 	int retval = 0;
-	char *temp = NULL;
 	struct perm_device *perm;
 
 	udev->mode = 0;
 
 	/* find the sysfs_device for this class device */
 	/* Wouldn't it really be nice if libsysfs could do this for us? */
-	if (class_dev->sysdevice) {
-		sysfs_device = class_dev->sysdevice;
-	} else {
+	sysfs_device = sysfs_get_classdev_device(class_dev);
+	if (sysfs_device == NULL) {
 		/* bah, let's go backwards up a level to see if the device is there,
 		 * as block partitions don't point to the physical device.  Need to fix that
 		 * up in the kernel...
 		 */
-		if (strstr(class_dev->path, "block")) {
+		if (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
 			dbg("looking at block device");
 			if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
-				char path[SYSFS_PATH_MAX];
-
 				dbg("really is a partition");
-				strfieldcpy(path, class_dev->path);
-				temp = strrchr(path, '/');
-				*temp = 0x00;
-				dbg("looking for a class device at '%s'", path);
-				class_dev_parent = sysfs_open_class_device(path);
+				class_dev_parent = sysfs_get_classdev_parent
+								   (class_dev);
 				if (class_dev_parent == NULL) {
-					dbg("sysfs_open_class_device at '%s' failed", path);
+					dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
 				} else {
 					dbg("class_dev_parent->name='%s'", class_dev_parent->name);
-					if (class_dev_parent->sysdevice)
-						sysfs_device = class_dev_parent->sysdevice;
+					sysfs_device = sysfs_get_classdev_device(class_dev_parent);
 				}
 			}
 		}
@@ -643,9 +635,6 @@ done:
 	dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
 	    udev->name, udev->owner, udev->group, udev->mode);
 
-	if (class_dev_parent)
-		sysfs_close_class_device(class_dev_parent);
-
 	return 0;
 }