[PATCH] libsysfs 0.4.0 patch

[elogind.git] / extras / scsi_id / scsi_id.c

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index df18271b48834e2febabc33350f4b7a4ee206833..6bb41132de1e3b248a99b00a2c28d1c0f697131d 100644 (file)
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -133,7 +133,7 @@ static int sysfs_is_bus(const char *sysfs_path, const char *bus)
                return -1;
 
        snprintf(bus_dev_name, MAX_NAME_LEN, "%s/%s/%s/%s/%s", sysfs_mnt_path,
-                SYSFS_BUS_DIR, bus, SYSFS_DEVICES_NAME, bus_id);
+                SYSFS_BUS_NAME, bus, SYSFS_DEVICES_NAME, bus_id);
 
        if (stat(sysfs_path, &stat_buf))
                return -1;
@@ -158,7 +158,7 @@ static int get_major_minor(const char *devpath, int *major, int *minor)
        char *dev;
 
        dprintf("%s\n", devpath);
-       class_dev = sysfs_open_class_device(devpath);
+       class_dev = sysfs_open_class_device_path(devpath);
        if (!class_dev) {
                log_message(LOG_WARNING, "open class %s failed: %s\n", devpath,
                            strerror(errno));
@@ -708,7 +708,7 @@ static int scsi_id(const char *target_path, char *maj_min_dev)
                return 1;
        }
 
-       scsi_dev = sysfs_open_class_device(full_dev_path);
+       scsi_dev = sysfs_open_class_device_path(full_dev_path);
        if (!scsi_dev) {
                log_message(LOG_WARNING, "open class %s failed: %s\n",
                            full_dev_path, strerror(errno));