Commit ab852189 authored by David Howells's avatar David Howells Committed by Steve French
Browse files

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: default avatarDavid 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: default avatarSteve French <stfrench@microsoft.com>
parent a68c7486

fs/netfs/io.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

fs/smb/client/smb2ops.c

+5 −3
Original line number Diff line number Diff line
@@ -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,7 +339,8 @@ 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",

		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;

	}