summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <smfrench@gmail.com>2018-05-06 15:58:51 -0500
committerSteve French <stfrench@microsoft.com>2018-05-27 17:56:35 -0500
commit71992e62b864e490d894184b3e5ae88f0635e524 (patch)
treed3860e2acb89232805cfb11cb5f00b10992f2717 /fs/cifs
parent9ec672bd17131fe26c966960a573a76fdb1da323 (diff)
downloadlinux-stable-71992e62b864e490d894184b3e5ae88f0635e524.tar.gz
linux-stable-71992e62b864e490d894184b3e5ae88f0635e524.tar.bz2
linux-stable-71992e62b864e490d894184b3e5ae88f0635e524.zip
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>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifs_debug.c4
-rw-r--r--fs/cifs/connect.c2
-rw-r--r--fs/cifs/smb2ops.c2
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
}