[Devel] [PATCH RHEL7 COMMIT] fs/fuse kio_pcs: add more traces for cs requests

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-693.21.1.vz7.50.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.21.1.vz7.50.15
------>
commit 146c0910216372772d77147b106a995b70c6d9c8
Author: Pavel Butsykin <pbutsykin at virtuozzo.com>
Date:   Mon Jun 25 19:02:43 2018 +0300

    fs/fuse kio_pcs: add more traces for cs requests
    
    Signed-off-by: Pavel Butsykin <pbutsykin at virtuozzo.com>
---
 fs/fuse/kio/pcs/pcs_cs.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/fs/fuse/kio/pcs/pcs_cs.c b/fs/fuse/kio/pcs/pcs_cs.c
index 17125527b1f2..251f75c8abf7 100644
--- a/fs/fuse/kio/pcs/pcs_cs.c
+++ b/fs/fuse/kio/pcs/pcs_cs.c
@@ -332,9 +332,12 @@ static void cs_response_done(struct pcs_msg *msg)
 
 		pcs_map_verify_sync_state(ireq->dentry, ireq, msg);
 	} else {
-		TRACE(XID_FMT " IO error %d %lu : %llu:%u+%u\n", XID_ARGS(ireq->iochunk.hbuf.hdr.xid),
-		      msg->error.value, msg->error.remote ? (unsigned long)msg->error.offender.val : 0UL,
-		      (unsigned long long)ireq->iochunk.chunk, (unsigned)ireq->iochunk.offset, (unsigned)ireq->iochunk.size);
+		TRACE(XID_FMT " IO error %d %lu, ireq:%p : %llu:%u+%u\n",
+		      XID_ARGS(ireq->iochunk.hbuf.hdr.xid), msg->error.value,
+		      msg->error.remote ? (unsigned long)msg->error.offender.val : 0UL,
+		      ireq, (unsigned long long)ireq->iochunk.chunk,
+		      (unsigned)ireq->iochunk.offset,
+		      (unsigned)ireq->iochunk.size);
 	}
 
 	pcs_copy_error_cond(&ireq->error, &msg->error);
@@ -542,11 +545,14 @@ void pcs_cs_submit(struct pcs_cs *cs, struct pcs_int_request *ireq)
 	ireq->wait_origin.val = 0;
 
 
-	DTRACE(XID_FMT " About to send msg:%p, ireq:%p :  %llu:%u+%u\n", XID_ARGS(ireq->iochunk.hbuf.hdr.xid),
-	      msg, ireq,
-	      (unsigned long long)ireq->iochunk.chunk,
-	      (unsigned)ireq->iochunk.offset,
-	      (unsigned)ireq->iochunk.size);
+	DTRACE(XID_FMT " About to send msg:%p, ireq:%p, cmd:%u,"
+		" id:"CUID_FMT" v:"VER_FMT" - %llu:%u+%u\n",
+		XID_ARGS(ireq->iochunk.hbuf.hdr.xid), msg, ireq,
+		ireq->iochunk.cmd, CUID_ARGS(ioh->uid),
+		VER_ARGS(ioh->map_version),
+		(unsigned long long)ireq->iochunk.chunk,
+		(unsigned)ireq->iochunk.offset,
+		(unsigned)ireq->iochunk.size);
 
 /* TODO reanable ratelimiting */
 #if 0