Commit 3e4fda9f authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman

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: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4cbab52d
...@@ -76,7 +76,8 @@ struct stub_unlink { ...@@ -76,7 +76,8 @@ struct stub_unlink {
__u32 status; __u32 status;
}; };
#define BUSID_SIZE 20 /* same as SYSFS_BUS_ID_SIZE */
#define BUSID_SIZE 32
struct bus_id_priv { struct bus_id_priv {
char name[BUSID_SIZE]; char name[BUSID_SIZE];
......
...@@ -57,7 +57,7 @@ static int unbind_interface_busid(char *busid) ...@@ -57,7 +57,7 @@ static int unbind_interface_busid(char *busid)
return -1; return -1;
} }
ret = write(fd, busid, strnlen(busid, BUS_ID_SIZE)); ret = write(fd, busid, strnlen(busid, SYSFS_BUS_ID_SIZE));
if (ret < 0) { if (ret < 0) {
dbg("write to unbind_path failed: %d", ret); dbg("write to unbind_path failed: %d", ret);
close(fd); close(fd);
...@@ -71,10 +71,11 @@ static int unbind_interface_busid(char *busid) ...@@ -71,10 +71,11 @@ static int unbind_interface_busid(char *busid)
static int unbind_interface(char *busid, int configvalue, int interface) 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"); 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); return unbind_interface_busid(inf_busid);
} }
...@@ -148,7 +149,7 @@ static int bind_interface_busid(char *busid, char *driver) ...@@ -148,7 +149,7 @@ static int bind_interface_busid(char *busid, char *driver)
if (fd < 0) if (fd < 0)
return -1; return -1;
ret = write(fd, busid, strnlen(busid, BUS_ID_SIZE)); ret = write(fd, busid, strnlen(busid, SYSFS_BUS_ID_SIZE));
if (ret < 0) { if (ret < 0) {
close(fd); close(fd);
return -1; return -1;
...@@ -161,9 +162,10 @@ static int bind_interface_busid(char *busid, char *driver) ...@@ -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) 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); return bind_interface_busid(inf_busid, driver);
} }
......
...@@ -20,7 +20,7 @@ int modify_match_busid(char *busid, int add) ...@@ -20,7 +20,7 @@ int modify_match_busid(char *busid, int add)
{ {
int fd; int fd;
int ret; int ret;
char buff[BUS_ID_SIZE + 4]; char buff[SYSFS_BUS_ID_SIZE + 4];
char sysfs_mntpath[SYSFS_PATH_MAX]; char sysfs_mntpath[SYSFS_PATH_MAX];
char match_busid_path[SYSFS_PATH_MAX]; char match_busid_path[SYSFS_PATH_MAX];
...@@ -35,7 +35,7 @@ int modify_match_busid(char *busid, int add) ...@@ -35,7 +35,7 @@ int modify_match_busid(char *busid, int add)
SYSFS_DRIVERS_NAME, USBIP_HOST_DRV_NAME); SYSFS_DRIVERS_NAME, USBIP_HOST_DRV_NAME);
/* BUS_IS_SIZE includes NULL termination? */ /* 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"); dbg("busid is too long");
return -1; return -1;
} }
...@@ -45,9 +45,9 @@ int modify_match_busid(char *busid, int add) ...@@ -45,9 +45,9 @@ int modify_match_busid(char *busid, int add)
return -1; return -1;
if (add) if (add)
snprintf(buff, BUS_ID_SIZE + 4, "add %s", busid); snprintf(buff, SYSFS_BUS_ID_SIZE + 4, "add %s", busid);
else 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); dbg("write \"%s\" to %s", buff, match_busid_path);
......
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
#include <stdlib.h> #include <stdlib.h>
/* Be sync to kernel header */
#define BUS_ID_SIZE 20
int modify_match_busid(char *busid, int add); int modify_match_busid(char *busid, int add);
int read_string(char *path, char *, size_t len); int read_string(char *path, char *, size_t len);
int read_integer(char *path); int read_integer(char *path);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment