staging: usbip: change the busid size

Change busid size to correspond with SYSFS_BUS_ID_SIZE, which was
already being used in most cases. This eliminates the need to define
BUS_ID_SIZE in the userspace code.

Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/usbip/stub.h b/drivers/staging/usbip/stub.h
index 2cc596e81623ca6831d78bf0b10ac76032a8c2cc..132adc57ebc1acae0d93a40848deb2b384787d78 100644 (file)
--- a/drivers/staging/usbip/stub.h
+++ b/drivers/staging/usbip/stub.h
@@ -76,7 +76,8 @@ struct stub_unlink {
        __u32 status;
 };
 
-#define BUSID_SIZE 20
+/* same as SYSFS_BUS_ID_SIZE */
+#define BUSID_SIZE 32
 
 struct bus_id_priv {
        char name[BUSID_SIZE];

diff --git a/drivers/staging/usbip/userspace/src/usbip_bind.c b/drivers/staging/usbip/userspace/src/usbip_bind.c
index 9869db277cc0f213ede592e0ac4872134d38d67f..978b7aa018528095274bee04159ee0b6bc7a4495 100644 (file)
--- a/drivers/staging/usbip/userspace/src/usbip_bind.c
+++ b/drivers/staging/usbip/userspace/src/usbip_bind.c
@@ -57,7 +57,7 @@ static int unbind_interface_busid(char *busid)
                return -1;
        }
 
-       ret = write(fd, busid, strnlen(busid, BUS_ID_SIZE));
+       ret = write(fd, busid, strnlen(busid, SYSFS_BUS_ID_SIZE));
        if (ret < 0) {
                dbg("write to unbind_path failed: %d", ret);
                close(fd);
@@ -71,10 +71,11 @@ static int unbind_interface_busid(char *busid)
 
 static int unbind_interface(char *busid, int configvalue, int interface)
 {
-       char inf_busid[BUS_ID_SIZE];
+       char inf_busid[SYSFS_BUS_ID_SIZE];
        dbg("unbinding interface");
 
-       snprintf(inf_busid, BUS_ID_SIZE, "%s:%d.%d", busid, configvalue, interface);
+       snprintf(inf_busid, SYSFS_BUS_ID_SIZE, "%s:%d.%d", busid, configvalue,
+                interface);
 
        return unbind_interface_busid(inf_busid);
 }
@@ -148,7 +149,7 @@ static int bind_interface_busid(char *busid, char *driver)
        if (fd < 0)
                return -1;
 
-       ret = write(fd, busid, strnlen(busid, BUS_ID_SIZE));
+       ret = write(fd, busid, strnlen(busid, SYSFS_BUS_ID_SIZE));
        if (ret < 0) {
                close(fd);
                return -1;
@@ -161,9 +162,10 @@ static int bind_interface_busid(char *busid, char *driver)
 
 static int bind_interface(char *busid, int configvalue, int interface, char *driver)
 {
-       char inf_busid[BUS_ID_SIZE];
+       char inf_busid[SYSFS_BUS_ID_SIZE];
 
-       snprintf(inf_busid, BUS_ID_SIZE, "%s:%d.%d", busid, configvalue, interface);
+       snprintf(inf_busid, SYSFS_BUS_ID_SIZE, "%s:%d.%d", busid, configvalue,
+                interface);
 
        return bind_interface_busid(inf_busid, driver);
 }

diff --git a/drivers/staging/usbip/userspace/src/utils.c b/drivers/staging/usbip/userspace/src/utils.c
index 6dbfdbd11d2b0dac9c8645518a77b3c43d6bd5ff..1da1109d11d391bf05e089aaeb9b1c6fde82a0fb 100644 (file)
--- a/drivers/staging/usbip/userspace/src/utils.c
+++ b/drivers/staging/usbip/userspace/src/utils.c
@@ -20,7 +20,7 @@ int modify_match_busid(char *busid, int add)
 {
        int fd;
        int ret;
-       char buff[BUS_ID_SIZE + 4];
+       char buff[SYSFS_BUS_ID_SIZE + 4];
        char sysfs_mntpath[SYSFS_PATH_MAX];
        char match_busid_path[SYSFS_PATH_MAX];
 
@@ -35,7 +35,7 @@ int modify_match_busid(char *busid, int add)
                 SYSFS_DRIVERS_NAME, USBIP_HOST_DRV_NAME);
 
        /* BUS_IS_SIZE includes NULL termination? */
-       if (strnlen(busid, BUS_ID_SIZE) > BUS_ID_SIZE - 1) {
+       if (strnlen(busid, SYSFS_BUS_ID_SIZE) > SYSFS_BUS_ID_SIZE - 1) {
                dbg("busid is too long");
                return -1;
        }
@@ -45,9 +45,9 @@ int modify_match_busid(char *busid, int add)
                return -1;
 
        if (add)
-               snprintf(buff, BUS_ID_SIZE + 4, "add %s", busid);
+               snprintf(buff, SYSFS_BUS_ID_SIZE + 4, "add %s", busid);
        else
-               snprintf(buff, BUS_ID_SIZE + 4, "del %s", busid);
+               snprintf(buff, SYSFS_BUS_ID_SIZE + 4, "del %s", busid);
 
        dbg("write \"%s\" to %s", buff, match_busid_path);
 

diff --git a/drivers/staging/usbip/userspace/src/utils.h b/drivers/staging/usbip/userspace/src/utils.h
index 36ee8d5ba45a7e76d97a6b3e778f86e0b4c6389e..b50e95a0a515dfd949f0f769981d98c029b308cb 100644 (file)
--- a/drivers/staging/usbip/userspace/src/utils.h
+++ b/drivers/staging/usbip/userspace/src/utils.h
@@ -3,9 +3,6 @@
 
 #include <stdlib.h>
 
-/* Be sync to kernel header */
-#define BUS_ID_SIZE 20
-
 int modify_match_busid(char *busid, int add);
 int read_string(char *path, char *, size_t len);
 int read_integer(char *path);