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
LU-16802 build: compatibility for 6.4 kernels
[fs/lustre-release.git]
/
lustre
/
obdclass
/
cl_io.c
diff --git
a/lustre/obdclass/cl_io.c
b/lustre/obdclass/cl_io.c
index
0cf0943
..
4035008
100644
(file)
--- a/
lustre/obdclass/cl_io.c
+++ b/
lustre/obdclass/cl_io.c
@@
-1211,7
+1211,7
@@
static void cl_sub_dio_end(const struct lu_env *env, struct cl_sync_io *anchor)
/* save the iovec pointer before it's modified by
* ll_dio_user_copy
*/
/* save the iovec pointer before it's modified by
* ll_dio_user_copy
*/
- struct iovec *tmp = (struct iovec *) sdio->csd_iter.iov;
+ struct iovec *tmp = (struct iovec *) sdio->csd_iter.
__
iov;
CDEBUG(D_VFSTRACE,
"finishing unaligned dio %s aio->cda_bytes %ld\n",
CDEBUG(D_VFSTRACE,
"finishing unaligned dio %s aio->cda_bytes %ld\n",
@@
-1227,7
+1227,7
@@
static void cl_sub_dio_end(const struct lu_env *env, struct cl_sync_io *anchor)
* because we have the unmodified iovec pointer
*/
OBD_FREE_PTR(tmp);
* because we have the unmodified iovec pointer
*/
OBD_FREE_PTR(tmp);
- sdio->csd_iter.iov = NULL;
+ sdio->csd_iter.
__
iov = NULL;
} else {
/* unaligned DIO does not get user pages, so it doesn't have to
* release them, but aligned I/O must
} else {
/* unaligned DIO does not get user pages, so it doesn't have to
* release them, but aligned I/O must
@@
-1306,13
+1306,13
@@
struct cl_sub_dio *cl_sub_dio_alloc(struct cl_dio_aio *ll_aio,
* separate thread requires a local copy of the iovec
*/
memcpy(&sdio->csd_iter, iter, sizeof(struct iov_iter));
* separate thread requires a local copy of the iovec
*/
memcpy(&sdio->csd_iter, iter, sizeof(struct iov_iter));
- OBD_ALLOC_PTR(sdio->csd_iter.iov);
- if (sdio->csd_iter.iov == NULL) {
+ OBD_ALLOC_PTR(sdio->csd_iter.
__
iov);
+ if (sdio->csd_iter.
__
iov == NULL) {
cl_sub_dio_free(sdio);
sdio = NULL;
goto out;
}
cl_sub_dio_free(sdio);
sdio = NULL;
goto out;
}
- memcpy((void *) sdio->csd_iter.
iov, iter->
iov,
+ memcpy((void *) sdio->csd_iter.
__iov, iter->__
iov,
sizeof(struct iovec));
}
}
sizeof(struct iovec));
}
}
@@
-1335,7
+1335,7
@@
EXPORT_SYMBOL(cl_dio_aio_free);
void cl_sub_dio_free(struct cl_sub_dio *sdio)
{
if (sdio) {
void cl_sub_dio_free(struct cl_sub_dio *sdio)
{
if (sdio) {
- void *tmp = (void *)sdio->csd_iter.iov;
+ void *tmp = (void *)sdio->csd_iter.
__
iov;
if (tmp) {
LASSERT(sdio->csd_unaligned);
if (tmp) {
LASSERT(sdio->csd_unaligned);