Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
* lctl set_route <nid> <up/down> enables or disables particular portals
[fs/lustre-release.git]
/
lustre
/
utils
/
obdiolib.c
diff --git
a/lustre/utils/obdiolib.c
b/lustre/utils/obdiolib.c
index
8c79c67
..
04dae88
100644
(file)
--- a/
lustre/utils/obdiolib.c
+++ b/
lustre/utils/obdiolib.c
@@
-38,7
+38,6
@@
obdio_iocinit (struct obdio_conn *conn)
{
memset (&conn->oc_data, 0, sizeof (conn->oc_data));
conn->oc_data.ioc_version = OBD_IOCTL_VERSION;
- conn->oc_data.ioc_addr = conn->oc_conn_addr;
conn->oc_data.ioc_cookie = conn->oc_conn_cookie;
conn->oc_data.ioc_len = sizeof (conn->oc_data);
}
@@
-103,12
+102,11
@@
obdio_connect (int device)
obdio_iocinit (conn);
rc = obdio_ioctl (conn, OBD_IOC_CONNECT);
if (rc != 0) {
- fprintf
(stderr, "obdio_connect: Can't connect to device %d: %s\n",
- device, strerror (errno));
+ fprintf
(stderr, "obdio_connect: Can't connect to device "
+
"%d: %s\n",
device, strerror (errno));
goto failed;
}
- conn->oc_conn_addr = conn->oc_data.ioc_addr;
conn->oc_conn_cookie = conn->oc_data.ioc_cookie;
return (conn);
@@
-118,7
+116,7
@@
obdio_connect (int device)
}
void
-obdio_disconnect (struct obdio_conn *conn)
+obdio_disconnect (struct obdio_conn *conn
, int flags
)
{
close (conn->oc_fd);
/* obdclass will automatically close on last ref */