diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-09-25 05:54:53 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-10-12 05:36:55 +0300 |
| commit | 33ec9c5cae2526ee2ef4f8224ddd2d7779b64e89 (patch) | |
| tree | d38d3908c4d8373374eab625c7269d2362dc3cc2 /drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h | |
| parent | 2f240c4ae8869907d4c8161ee015bedb366512e2 (diff) | |
| download | linux-33ec9c5cae2526ee2ef4f8224ddd2d7779b64e89.tar.xz | |
lustre: switch struct ksock_conn to iov_iter
Merge ksnc_rx_{no_wanted,iov,kiov,niov,nkiov} into a single iov_iter
(ksnc_rx_to).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h')
| -rw-r--r-- | drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h index e6428c4b7aec..694d45b45976 100644 --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h @@ -357,11 +357,7 @@ struct ksock_conn { __u8 ksnc_rx_scheduled; /* being progressed */ __u8 ksnc_rx_state; /* what is being read */ int ksnc_rx_nob_left; /* # bytes to next hdr/body */ - int ksnc_rx_nob_wanted;/* bytes actually wanted */ - int ksnc_rx_niov; /* # iovec frags */ - struct kvec *ksnc_rx_iov; /* the iovec frags */ - int ksnc_rx_nkiov; /* # page frags */ - struct bio_vec *ksnc_rx_kiov; /* the page frags */ + struct iov_iter ksnc_rx_to; /* copy destination */ union ksock_rxiovspace ksnc_rx_iov_space; /* space for frag descriptors */ __u32 ksnc_rx_csum; /* partial checksum for incoming * data |