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 <smfrench@gmail.com>
CC: Ronnie Sahlberg <lsahlber@redhat.com>

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 43ae00cd160f9551f1e085a51ffbe87a0cc5a2ff..e6025e93c5eb01795d59cdf50ada7fd43c9b60ad 100644 (file)
--- 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 be3308b44944d7cc205e9571a57bdbde63cb5840..83b0234d443c675c5d169b4a9c825bb45021d2cc 100644 (file)
--- 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 b3fb2909445b94d9e17b0b40f8d79bf96edc6e41..718dbe22528b5fdbb847501f4c555f0257049429 100644 (file)
--- 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
 }