LU-10391 ptlrpc: change bd_sender in ptlrpc_bulk_frag_ops

bd_sender in struct ptlrpc_bulk_frag_ops is now 'struct lnet_nid'.

Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I43a6600dcc814a6a46b3a793641545123efaa6ab
Reviewed-on: https://review.whamcloud.com/44640
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Frank Sehr <fsehr@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Chris Horn <chris.horn@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index 2e35734..044caa6 100644 (file)
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -1384,17 +1384,17 @@ struct ptlrpc_bulk_desc {
        /** Back pointer to the request */
        struct ptlrpc_request *bd_req;
        const struct ptlrpc_bulk_frag_ops *bd_frag_ops;
-       wait_queue_head_t      bd_waitq;        /* server side only WQ */
-       int                    bd_iov_count;    /* # entries in bd_iov */
-       int                    bd_max_iov;      /* allocated size of bd_iov */
-       int                    bd_nob;          /* # bytes covered */
-       int                    bd_nob_transferred; /* # bytes GOT/PUT */
+       wait_queue_head_t       bd_waitq;       /* server side only WQ */
+       int                     bd_iov_count;   /* # entries in bd_iov */
+       int                     bd_max_iov;     /* allocated size of bd_iov */
+       int                     bd_nob;         /* # bytes covered */
+       int                     bd_nob_transferred; /* # bytes GOT/PUT */
        unsigned int            bd_nob_last;    /* # bytes in last MD */
 
-       __u64                  bd_last_mbits;
+       __u64                   bd_last_mbits;
 
-       struct ptlrpc_cb_id    bd_cbid;         /* network callback info */
-       lnet_nid_t             bd_sender;       /* stash event::sender */
+       struct ptlrpc_cb_id     bd_cbid;        /* network callback info */
+       struct lnet_nid         bd_sender;      /* stash event::sender */
        int                     bd_md_count;    /* # valid entries in bd_mds */
        int                     bd_md_max_brw;  /* max entries in bd_mds */
 

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index fded520..b9e7d5c 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -2238,9 +2238,9 @@ static int osc_brw_fini_request(struct ptlrpc_request *req, int rc)
                        GOTO(out, rc);
 
                if (req->rq_bulk != NULL &&
-                   lnet_nid_to_nid4(&peer->nid) != req->rq_bulk->bd_sender) {
+                   !nid_same(&peer->nid, &req->rq_bulk->bd_sender)) {
                        via = " via ";
-                       router = libcfs_nid2str(req->rq_bulk->bd_sender);
+                       router = libcfs_nidstr(&req->rq_bulk->bd_sender);
                }
 
                if (server_cksum != client_cksum) {

diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index 61542ac..d616b74 100644 (file)
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -219,7 +219,7 @@ void client_bulk_callback(struct lnet_event *ev)
 
        if (ev->type != LNET_EVENT_UNLINK && ev->status == 0) {
                desc->bd_nob_transferred += ev->mlength;
-               desc->bd_sender = lnet_nid_to_nid4(&ev->sender);
+               desc->bd_sender = ev->sender;
        } else {
                /* start reconnect and resend if network error hit */
                spin_lock(&req->rq_lock);
@@ -486,7 +486,7 @@ void server_bulk_callback(struct lnet_event *ev)
                 * before the SENT event (oh yes we can), we know we
                 * read/wrote the peer buffer and how much... */
                desc->bd_nob_transferred += ev->mlength;
-               desc->bd_sender = lnet_nid_to_nid4(&ev->sender);
+               desc->bd_sender = ev->sender;
        }
 
        if (ev->status != 0)

diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c
index 7572c0e..d0be636 100644 (file)
--- a/lustre/target/tgt_handler.c
+++ b/lustre/target/tgt_handler.c
@@ -2606,9 +2606,9 @@ static void tgt_warn_on_cksum(struct ptlrpc_request *req,
        body = req_capsule_client_get(&req->rq_pill, &RMF_OST_BODY);
        LASSERT(body != NULL);
 
-       if (desc && lnet_nid_to_nid4(&req->rq_peer.nid) != desc->bd_sender) {
+       if (desc && !nid_same(&req->rq_peer.nid, &desc->bd_sender)) {
                via = " via ";
-               router = libcfs_nid2str(desc->bd_sender);
+               router = libcfs_nidstr(&desc->bd_sender);
        }
 
        if (exp->exp_obd->obd_checksum_dump)