LU-13004 ptlrpc: simplify bd_vec access.

[fs/lustre-release.git] / lustre / include / lustre_net.h

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index a8420ba..678e482 100644 (file)
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -1447,20 +1447,11 @@ struct ptlrpc_bulk_desc {
        /** array of associated MDs */
        struct lnet_handle_md   bd_mds[PTLRPC_BULK_OPS_COUNT];
 
-       struct {
-               /*
-                * encrypt iov, size is either 0 or bd_iov_count.
-                */
-               lnet_kiov_t *bd_enc_vec;
-               lnet_kiov_t *bd_vec;
-       } bd_kiov;
+       /* encrypted iov, size is either 0 or bd_iov_count. */
+       lnet_kiov_t *bd_enc_vec;
+       lnet_kiov_t *bd_vec;
 };
 
-#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,
        SVC_STOPPED     = 1 << 0,