From 47c5b20a138974fa29629e3a31afe36b1c525bc1 Mon Sep 17 00:00:00 2001 From: adilger Date: Sun, 4 May 2003 00:33:03 +0000 Subject: [PATCH] Merge from b_devel to b_orphan (ORPHAN_BASE5 -> ORPHAN_BASE6). --- lustre/utils/obdiolib.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lustre/utils/obdiolib.c b/lustre/utils/obdiolib.c index 223bfa5..04dae88 100644 --- 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); -- 1.8.3.1