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
land v0.9.1 on HEAD, in preparation for a 1.0.x branch
[fs/lustre-release.git]
/
lustre
/
utils
/
obdiolib.c
diff --git
a/lustre/utils/obdiolib.c
b/lustre/utils/obdiolib.c
index
8c79c67
..
461a8c0
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 */
@@
-126,40
+124,6
@@
obdio_disconnect (struct obdio_conn *conn)
}
int
-obdio_open (struct obdio_conn *conn, uint64_t oid, struct lustre_handle *fh)
-{
- int rc;
-
- obdio_iocinit (conn);
-
- conn->oc_data.ioc_obdo1.o_id = oid;
- conn->oc_data.ioc_obdo1.o_mode = S_IFREG;
- conn->oc_data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
-
- rc = obdio_ioctl (conn, OBD_IOC_OPEN);
-
- if (rc == 0)
- memcpy (fh, obdo_handle(&conn->oc_data.ioc_obdo1), sizeof (*fh));
-
- return (rc);
-}
-
-int
-obdio_close (struct obdio_conn *conn, uint64_t oid, struct lustre_handle *fh)
-{
- obdio_iocinit (conn);
-
-
- conn->oc_data.ioc_obdo1.o_id = oid;
- conn->oc_data.ioc_obdo1.o_mode = S_IFREG;
- memcpy (obdo_handle (&conn->oc_data.ioc_obdo1), fh, sizeof (*fh));
- conn->oc_data.ioc_obdo1.o_valid = OBD_MD_FLID | OBD_MD_FLTYPE |
- OBD_MD_FLMODE | OBD_MD_FLHANDLE;
-
- return (obdio_ioctl (conn, OBD_IOC_CLOSE));
-}
-
-int
obdio_pread (struct obdio_conn *conn, uint64_t oid,
char *buffer, uint32_t count, uint64_t offset)
{
@@
-266,7
+230,6
@@
obdio_new_barrier (uint64_t oid, uint64_t id, int npeers)
int
obdio_setup_barrier (struct obdio_conn *conn, struct obdio_barrier *b)
{
- struct lustre_handle fh;
struct lustre_handle lh;
int rc;
int rc2;
@@
-279,19
+242,11
@@
obdio_setup_barrier (struct obdio_conn *conn, struct obdio_barrier *b)
abort ();
}
- rc = obdio_open (conn, b->ob_oid, &fh);
- if (rc != 0) {
- fprintf (stderr, "obdio_setup_barrier "LPX64": Failed to open object: %s\n",
- b->ob_oid, strerror (errno));
- return (rc);
- }
-
fileb = (struct obdio_barrier *) obdio_alloc_aligned_buffer (&space, getpagesize ());
if (fileb == NULL) {
fprintf (stderr, "obdio_setup_barrier "LPX64": Can't allocate page buffer\n",
b->ob_oid);
- rc = -1;
- goto out_0;
+ return (-1);
}
memset (fileb, 0, getpagesize ());
@@
-301,7
+256,7
@@
obdio_setup_barrier (struct obdio_conn *conn, struct obdio_barrier *b)
if (rc != 0) {
fprintf (stderr, "obdio_setup_barrier "LPX64": Error on enqueue: %s\n",
b->ob_oid, strerror (errno));
- goto out
_1
;
+ goto out;
}
rc = obdio_pwrite (conn, b->ob_oid, (void *)fileb, getpagesize (), 0);
@@
-315,23
+270,14
@@
obdio_setup_barrier (struct obdio_conn *conn, struct obdio_barrier *b)
b->ob_oid, strerror (errno));
rc = rc2;
}
- out
_1
:
+ out:
free (space);
- out_0:
- rc2 = obdio_close (conn, b->ob_oid, &fh);
- if (rc == 0 && rc2 != 0) {
- fprintf (stderr, "obdio_setup_barrier "LPX64": Error on close: %s\n",
- b->ob_oid, strerror (errno));
- rc = rc2;
- }
-
return (rc);
}
int
obdio_barrier (struct obdio_conn *conn, struct obdio_barrier *b)
{
- struct lustre_handle fh;
struct lustre_handle lh;
int rc;
int rc2;
@@
-339,19
+285,11
@@
obdio_barrier (struct obdio_conn *conn, struct obdio_barrier *b)
struct obdio_barrier *fileb;
char *mode;
- rc = obdio_open (conn, b->ob_oid, &fh);
- if (rc != 0) {
- fprintf (stderr, "obdio_barrier "LPX64": Error on open: %s\n",
- b->ob_oid, strerror (errno));
- return (rc);
- }
-
fileb = (struct obdio_barrier *) obdio_alloc_aligned_buffer (&space, getpagesize ());
if (fileb == NULL) {
fprintf (stderr, "obdio_barrier "LPX64": Can't allocate page buffer\n",
b->ob_oid);
- rc = -1;
- goto out_0;
+ return (-1);
}
rc = obdio_enqueue (conn, b->ob_oid, LCK_PW, 0, getpagesize (), &lh);
@@
-452,14
+390,6
@@
obdio_barrier (struct obdio_conn *conn, struct obdio_barrier *b)
}
out_1:
free (space);
- out_0:
- rc2 = obdio_close (conn, b->ob_oid, &fh);
- if (rc == 0 && rc2 != 0) {
- fprintf (stderr, "obdio_barrier "LPX64": Error on close: %s\n",
- b->ob_oid, strerror (errno));
- rc = rc2;
- }
-
return (rc);
}