Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71992e62 authored by Steve French's avatar Steve French Committed by Steve French
Browse files

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: default avatarSteve French <smfrench@gmail.com>
CC: Ronnie Sahlberg <lsahlber@redhat.com>
parent 9ec672bd

fs/cifs/cifs_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

		}

fs/cifs/connect.c

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

fs/cifs/smb2ops.c

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

}