X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libsysio%2Fsrc%2Fiowait.c;h=939b9216f7a3e5efd10442d5d549eeb8de626ba9;hb=848f9e20320cb7c01eaf7f1b5c27f5efd54e4818;hp=28035e3ef8eac5b2387808701753707122cece9b;hpb=b8292c00324fbe9a25910ce53d03569186ea3e2c;p=fs%2Flustre-release.git diff --git a/libsysio/src/iowait.c b/libsysio/src/iowait.c index 28035e3..939b921 100644 --- a/libsysio/src/iowait.c +++ b/libsysio/src/iowait.c @@ -43,6 +43,7 @@ #include #include +#include #include #include "sysio.h" @@ -56,7 +57,7 @@ * Poll status of asynch IO request. */ int -SYSIO_INTERFACE_NAME(iodone)(ioid_t ioid) +SYSIO_INTERFACE_NAME(iodone)(void *ioid) { struct ioctx *ioctx; int rc; @@ -67,10 +68,7 @@ SYSIO_INTERFACE_NAME(iodone)(ioid_t ioid) if (!ioctx) SYSIO_INTERFACE_RETURN(-1, -EINVAL); - rc = - (ioctx->ioctx_done || - (*ioctx->ioctx_ino->i_ops.inop_iodone)(ioctx)); - + rc = _sysio_ioctx_done(ioctx); SYSIO_INTERFACE_RETURN(rc < 0 ? -1 : rc, rc < 0 ? rc : 0); } @@ -81,7 +79,7 @@ SYSIO_INTERFACE_NAME(iodone)(ioid_t ioid) * The identifier is no longer valid after return. */ ssize_t -SYSIO_INTERFACE_NAME(iowait)(ioid_t ioid) +SYSIO_INTERFACE_NAME(iowait)(void *ioid) { struct ioctx *ioctx; ssize_t cc;