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

cifs: SMB1 split: netmisc.c 



Split a variety of bits from netmisc.c into other places, notably the error
table into smb1maperror.c.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Steve French <sfrench@samba.org>
cc: Paulo Alcantara <pc@manguebit.org>
cc: Enzo Matsumiya <ematsumiya@suse.de>
cc: linux-cifs@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
cc: linux-kernel@vger.kernel.org
Acked-by: default avatarEnzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 3739f6d2

fs/smb/client/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ cifs-$(CONFIG_CIFS_ROOT) += cifsroot.o 
cifs-$(CONFIG_CIFS_ALLOW_INSECURE_LEGACY) += \

	cifssmb.o \

	smb1debug.o \

	smb1maperror.o \

	smb1misc.o \

	smb1ops.o \

	smb1transport.o

fs/smb/client/cifsproto.h

+0 −4
Original line number Diff line number Diff line
@@ -148,14 +148,10 @@ int cifs_get_readable_path(struct cifs_tcon *tcon, const char *name, 
			   struct cifsFileInfo **ret_file);

int cifs_get_hardlink_path(struct cifs_tcon *tcon, struct inode *inode,

			   struct file *file);

unsigned int smbCalcSize(void *buf);

int decode_negTokenInit(unsigned char *security_blob, int length,

			struct TCP_Server_Info *server);

int cifs_convert_address(struct sockaddr *dst, const char *src, int len);

void cifs_set_port(struct sockaddr *addr, const unsigned short int port);

int map_smb_to_linux_error(char *buf, bool logErr);

int map_and_check_smb_error(struct TCP_Server_Info *server,

			    struct mid_q_entry *mid, bool logErr);

int CIFS_SessSetup(const unsigned int xid, struct cifs_ses *ses,

		   struct TCP_Server_Info *server,

		   const struct nls_table *nls_cp);

fs/smb/client/netmisc.c

+0 −822

File changed.

Preview size limit exceeded, changes collapsed.

fs/smb/client/smb1maperror.c

0 → 100644
+825 −0

File added.

Preview size limit exceeded, changes collapsed.

fs/smb/client/smb1misc.c

+12 −0
Original line number Diff line number Diff line
@@ -175,3 +175,15 @@ is_valid_oplock_break(char *buffer, struct TCP_Server_Info *srv) 
	cifs_dbg(FYI, "Can not process oplock break for non-existent connection\n");

	return true;

}



/*

 * calculate the size of the SMB message based on the fixed header

 * portion, the number of word parameters and the data portion of the message

 */

unsigned int

smbCalcSize(void *buf)

{

	struct smb_hdr *ptr = buf;

	return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) +

		2 /* size of the bcc field */ + get_bcc(ptr));

}