LU-6070 libcfs: provide separate buffers for libcfs_*2str()

[fs/lustre-release.git] / lustre / osc / osc_request.c

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 75d1290..e60a1b0 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -1453,8 +1453,8 @@ static int osc_brw_fini_request(struct ptlrpc_request *req, int rc)
         if (body->oa.o_valid & OBD_MD_FLCKSUM) {
                 static int cksum_counter;
                u32        server_cksum = body->oa.o_cksum;
-                char      *via;
-                char      *router;
+               char      *via = "";
+               char      *router = "";
                 cksum_type_t cksum_type;
 
                 cksum_type = cksum_type_unpack(body->oa.o_valid &OBD_MD_FLFLAGS?
@@ -1463,12 +1463,10 @@ static int osc_brw_fini_request(struct ptlrpc_request *req, int rc)
                                                  aa->aa_ppga, OST_READ,
                                                  cksum_type);
 
-                if (peer->nid == req->rq_bulk->bd_sender) {
-                        via = router = "";
-                } else {
-                        via = " via ";
-                        router = libcfs_nid2str(req->rq_bulk->bd_sender);
-                }
+               if (peer->nid != req->rq_bulk->bd_sender) {
+                       via = " via ";
+                       router = libcfs_nid2str(req->rq_bulk->bd_sender);
+               }
 
                if (server_cksum != client_cksum) {
                        LCONSOLE_ERROR_MSG(0x133, "%s: BAD READ CHECKSUM: from "