From 2006ca8d430dff6dda7981b901899293bfd33180 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Wed, 4 Dec 2019 13:22:29 +1100 Subject: [PATCH] LU-13004 ptlrpc: remove *GET*KVEC macros and fields. GET_KVEC, BD_GET_KVEC, GET_ENC_KVEC, BD_GET_ENC_KVEC are no longer used. There are the only users of the bd_kvec field of bd_u, so that field can be removed, and bd_u can be discarded and its other field (bd_kiov) promoted. Signed-off-by: Mr NeilBrown Change-Id: I31d19f6867c907029aa8d9ceee27c5ac9c9225a1 Reviewed-on: https://review.whamcloud.com/36972 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Shaun Tancheff Reviewed-by: Oleg Drokin --- lustre/include/lustre_net.h | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h index 2e171a7..a8420ba 100644 --- a/lustre/include/lustre_net.h +++ b/lustre/include/lustre_net.h @@ -1447,31 +1447,19 @@ struct ptlrpc_bulk_desc { /** array of associated MDs */ struct lnet_handle_md bd_mds[PTLRPC_BULK_OPS_COUNT]; - union { - struct { - /* - * encrypt iov, size is either 0 or bd_iov_count. - */ - lnet_kiov_t *bd_enc_vec; - lnet_kiov_t *bd_vec; - } bd_kiov; - - struct { - struct kvec *bd_enc_kvec; - struct kvec *bd_kvec; - } bd_kvec; - } bd_u; - + struct { + /* + * encrypt iov, size is either 0 or bd_iov_count. + */ + lnet_kiov_t *bd_enc_vec; + lnet_kiov_t *bd_vec; + } bd_kiov; }; -#define GET_KIOV(desc) ((desc)->bd_u.bd_kiov.bd_vec) -#define BD_GET_KIOV(desc, i) ((desc)->bd_u.bd_kiov.bd_vec[i]) -#define GET_ENC_KIOV(desc) ((desc)->bd_u.bd_kiov.bd_enc_vec) -#define BD_GET_ENC_KIOV(desc, i) ((desc)->bd_u.bd_kiov.bd_enc_vec[i]) -#define GET_KVEC(desc) ((desc)->bd_u.bd_kvec.bd_kvec) -#define BD_GET_KVEC(desc, i) ((desc)->bd_u.bd_kvec.bd_kvec[i]) -#define GET_ENC_KVEC(desc) ((desc)->bd_u.bd_kvec.bd_enc_kvec) -#define BD_GET_ENC_KVEC(desc, i) ((desc)->bd_u.bd_kvec.bd_enc_kvec[i]) +#define GET_KIOV(desc) ((desc)->bd_kiov.bd_vec) +#define BD_GET_KIOV(desc, i) ((desc)->bd_kiov.bd_vec[i]) +#define GET_ENC_KIOV(desc) ((desc)->bd_kiov.bd_enc_vec) +#define BD_GET_ENC_KIOV(desc, i) ((desc)->bd_kiov.bd_enc_vec[i]) enum { SVC_INIT = 0, -- 1.8.3.1