netfs, cifs: Improve some debugging bits

Improve some debugging bits:

 (1) The netfslib _debug() macro doesn't need a newline in its format
     string.

 (2) Display the request debug ID and subrequest index in messages emitted
     in smb2_adjust_credits() to make it easier to reference in traces.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Steve French <sfrench@samba.org>
cc: Paulo Alcantara <pc@manguebit.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: linux-cifs@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/netfs/io.c b/fs/netfs/io.c
index 943128507af550f36a9d90a0e245e2e810ce555f..d6ada4eba74455aad26273a63247356a3910dc4e 100644 (file)
--- a/fs/netfs/io.c
+++ b/fs/netfs/io.c
@@ -270,7 +270,7 @@ static void netfs_reset_subreq_iter(struct netfs_io_request *rreq,
        if (count == remaining)
                return;
 
-       _debug("R=%08x[%u] ITER RESUB-MISMATCH %zx != %zx-%zx-%llx %x\n",
+       _debug("R=%08x[%u] ITER RESUB-MISMATCH %zx != %zx-%zx-%llx %x",
               rreq->debug_id, subreq->debug_index,
               iov_iter_count(&subreq->io_iter), subreq->transferred,
               subreq->len, rreq->i_size,

diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index 4df84ebe8dbe53e5112fe0ec57f9399f22471d9f..e6540072ffb0e1ec63d1fc36122fc1e29f6064c9 100644 (file)
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -316,7 +316,8 @@ smb2_adjust_credits(struct TCP_Server_Info *server,
                                      cifs_trace_rw_credits_no_adjust_up);
                trace_smb3_too_many_credits(server->CurrentMid,
                                server->conn_id, server->hostname, 0, credits->value - new_val, 0);
-               cifs_server_dbg(VFS, "request has less credits (%d) than required (%d)",
+               cifs_server_dbg(VFS, "R=%x[%x] request has less credits (%d) than required (%d)",
+                               subreq->rreq->debug_id, subreq->subreq.debug_index,
                                credits->value, new_val);
 
                return -EOPNOTSUPP;
@@ -338,8 +339,9 @@ smb2_adjust_credits(struct TCP_Server_Info *server,
                trace_smb3_reconnect_detected(server->CurrentMid,
                        server->conn_id, server->hostname, scredits,
                        credits->value - new_val, in_flight);
-               cifs_server_dbg(VFS, "trying to return %d credits to old session\n",
-                        credits->value - new_val);
+               cifs_server_dbg(VFS, "R=%x[%x] trying to return %d credits to old session\n",
+                               subreq->rreq->debug_id, subreq->subreq.debug_index,
+                               credits->value - new_val);
                return -EAGAIN;
        }