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
Branch HEAD
[fs/lustre-release.git]
/
lustre
/
utils
/
obdiolib.c
diff --git
a/lustre/utils/obdiolib.c
b/lustre/utils/obdiolib.c
index
e6f715f
..
fa272db
100644
(file)
--- a/
lustre/utils/obdiolib.c
+++ b/
lustre/utils/obdiolib.c
@@
-152,6
+152,8
@@
obdio_pwrite (struct obdio_conn *conn, __u64 oid,
conn->oc_data.ioc_obdo1.o_valid =
OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
conn->oc_data.ioc_obdo1.o_valid =
OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLMODE;
+ conn->oc_data.ioc_pbuf1 = (void*)1;
+ conn->oc_data.ioc_plen1 = 1;
conn->oc_data.ioc_pbuf2 = buffer;
conn->oc_data.ioc_plen2 = count;
conn->oc_data.ioc_count = count;
conn->oc_data.ioc_pbuf2 = buffer;
conn->oc_data.ioc_plen2 = count;
conn->oc_data.ioc_count = count;
@@
-180,7
+182,7
@@
obdio_enqueue (struct obdio_conn *conn, __u64 oid,
rc = obdio_ioctl (conn, ECHO_IOC_ENQUEUE);
if (rc == 0)
rc = obdio_ioctl (conn, ECHO_IOC_ENQUEUE);
if (rc == 0)
-
memcpy (lh, obdo_handle (&conn->oc_data.ioc_obdo1), sizeof (*lh))
;
+
*lh = conn->oc_data.ioc_obdo1.o_handle
;
return (rc);
}
return (rc);
}
@@
-190,7
+192,7
@@
obdio_cancel (struct obdio_conn *conn, struct lustre_handle *lh)
{
obdio_iocinit (conn);
{
obdio_iocinit (conn);
-
memcpy (obdo_handle (&conn->oc_data.ioc_obdo1), lh, sizeof (*lh))
;
+
conn->oc_data.ioc_obdo1.o_handle = *lh
;
conn->oc_data.ioc_obdo1.o_valid = OBD_MD_FLHANDLE;
return (obdio_ioctl (conn, ECHO_IOC_CANCEL));
conn->oc_data.ioc_obdo1.o_valid = OBD_MD_FLHANDLE;
return (obdio_ioctl (conn, ECHO_IOC_CANCEL));