From 71992e62b864e490d894184b3e5ae88f0635e524 Mon Sep 17 00:00:00 2001 From: Steve French Date: Sun, 6 May 2018 15:58:51 -0500 Subject: [PATCH] cifs: fix build break when CONFIG_CIFS_DEBUG2 enabled Previous patches "cifs: update calc_size to take a server argument" and "cifs: add server argument to the dump_detail method" were broken if CONFIG_CIFS_DEBUG2 enabled Signed-off-by: Steve French CC: Ronnie Sahlberg --- fs/cifs/cifs_debug.c | 4 ++-- fs/cifs/connect.c | 2 +- fs/cifs/smb2ops.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c index 43ae00cd160f..e6025e93c5eb 100644 --- a/fs/cifs/cifs_debug.c +++ b/fs/cifs/cifs_debug.c @@ -51,7 +51,7 @@ void cifs_dump_detail(void *buf, struct TCP_Server_Info *server) smb->Command, smb->Status.CifsError, smb->Flags, smb->Flags2, smb->Mid, smb->Pid); cifs_dbg(VFS, "smb buf %p len %u\n", smb, - server->ops->calc_smb_size(smb)); + server->ops->calc_smb_size(smb, server)); #endif /* CONFIG_CIFS_DEBUG2 */ } @@ -84,7 +84,7 @@ void cifs_dump_mids(struct TCP_Server_Info *server) cifs_dbg(VFS, "IsMult: %d IsEnd: %d\n", mid_entry->multiRsp, mid_entry->multiEnd); if (mid_entry->resp_buf) { - cifs_dump_detail(mid_entry->resp_buf); + cifs_dump_detail(mid_entry->resp_buf, server); cifs_dump_mem("existing buf: ", mid_entry->resp_buf, 62); } diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index be3308b44944..83b0234d443c 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -951,7 +951,7 @@ cifs_demultiplex_thread(void *p) HEADER_SIZE(server)); #ifdef CONFIG_CIFS_DEBUG2 if (server->ops->dump_detail) - server->ops->dump_detail(buf); + server->ops->dump_detail(buf, server); cifs_dump_mids(server); #endif /* CIFS_DEBUG2 */ diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index b3fb2909445b..718dbe22528b 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -221,7 +221,7 @@ smb2_dump_detail(void *buf, struct TCP_Server_Info *server) shdr->Command, shdr->Status, shdr->Flags, shdr->MessageId, shdr->ProcessId); cifs_dbg(VFS, "smb buf %p len %u\n", buf, - server->ops->calc_smb_size(buf)); + server->ops->calc_smb_size(buf, server)); #endif } -- 2.30.2