Commit 2dc7e1c0 authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Make transport routines work with SMB2 



Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent ddfbefbd

fs/cifs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ cifs-$(CONFIG_CIFS_DFS_UPCALL) += dns_resolve.o cifs_dfs_ref.o 


cifs-$(CONFIG_CIFS_FSCACHE) += fscache.o cache.o



cifs-$(CONFIG_CIFS_SMB2) += smb2ops.o smb2maperror.o
 
cifs-$(CONFIG_CIFS_SMB2) += smb2ops.o smb2maperror.o smb2transport.o

fs/cifs/cifsglob.h

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/in.h>

#include <linux/in6.h>

#include <linux/slab.h>

#include <linux/mempool.h>

#include <linux/workqueue.h>

#include "cifs_fs_sb.h"

#include "cifsacl.h"
@@ -218,6 +219,7 @@ struct smb_version_values { 
	size_t		header_size;

	size_t		max_header_size;

	size_t		read_rsp_size;

	__le16		lock_cmd;

};



#define HEADER_SIZE(server) (server->vals->header_size)
@@ -812,6 +814,7 @@ typedef void (mid_callback_t)(struct mid_q_entry *mid); 
/* one of these for every pending CIFS request to the server */

struct mid_q_entry {

	struct list_head qhead;	/* mids waiting on reply from this server */

	struct TCP_Server_Info *server;	/* server corresponding to this mid */

	__u64 mid;		/* multiplex id */

	__u32 pid;		/* process id */

	__u32 sequence_number;  /* for CIFS signing */
@@ -1153,6 +1156,8 @@ void cifs_oplock_break(struct work_struct *work); 
extern const struct slow_work_ops cifs_oplock_break_ops;

extern struct workqueue_struct *cifsiod_wq;



extern mempool_t *cifs_mid_poolp;



/* Operations for different SMB versions */

#define SMB1_VERSION_STRING	"1.0"

extern struct smb_version_operations smb1_operations;

fs/cifs/cifsproto.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ extern char *cifs_compose_mount_options(const char *sb_mountdata, 
extern struct mid_q_entry *AllocMidQEntry(const struct smb_hdr *smb_buffer,

					struct TCP_Server_Info *server);

extern void DeleteMidQEntry(struct mid_q_entry *midEntry);

extern void cifs_wake_up_task(struct mid_q_entry *mid);

extern int cifs_call_async(struct TCP_Server_Info *server, struct kvec *iov,

			   unsigned int nvec, mid_receive_t *receive,

			   mid_callback_t *callback, void *cbdata,

fs/cifs/smb1ops.c

+1 −0
Original line number Diff line number Diff line
@@ -445,4 +445,5 @@ struct smb_version_values smb1_values = { 
	.header_size = sizeof(struct smb_hdr),

	.max_header_size = MAX_CIFS_HDR_SIZE,

	.read_rsp_size = sizeof(READ_RSP),

	.lock_cmd = cpu_to_le16(SMB_COM_LOCKING_ANDX),

};

fs/cifs/smb2ops.c

+17 −0
Original line number Diff line number Diff line
@@ -18,10 +18,27 @@ 
 */



#include "cifsglob.h"

#include "smb2pdu.h"

#include "smb2proto.h"



static __u64

smb2_get_next_mid(struct TCP_Server_Info *server)

{

	__u64 mid;

	/* for SMB2 we need the current value */

	spin_lock(&GlobalMid_Lock);

	mid = server->CurrentMid++;

	spin_unlock(&GlobalMid_Lock);

	return mid;

}



struct smb_version_operations smb21_operations = {

	.setup_request = smb2_setup_request,

	.check_receive = smb2_check_receive,

	.get_next_mid = smb2_get_next_mid,

};



struct smb_version_values smb21_values = {

	.version_string = SMB21_VERSION_STRING,

	.lock_cmd = SMB2_LOCK,

};