Commit 0496e02d authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: turn smb_send into a wrapper around smb_sendv 



cifs: turn smb_send into a wrapper around smb_sendv

Rename smb_send2 to smb_sendv to make it consistent with kernel naming
conventions for functions that take a vector.

There's no need to have 2 functions to handle sending SMB calls. Turn
smb_send into a wrapper around smb_sendv. This also allows us to
properly mark the socket as needing to be reconnected when there's a
partial send from smb_send.

Also, in practice we always use the address and noblocksnd flag
that's attached to the TCP_Server_Info. There's no need to pass
them in as separate args to smb_sendv.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Acked-by: default avatarDave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 18e352e4

fs/cifs/cifsproto.h

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ extern struct smb_hdr *cifs_buf_get(void); 
extern void cifs_buf_release(void *);

extern struct smb_hdr *cifs_small_buf_get(void);

extern void cifs_small_buf_release(void *);

extern int smb_send(struct socket *, struct smb_hdr *,

			unsigned int /* length */ , struct sockaddr *, bool);

extern int smb_send(struct TCP_Server_Info *, struct smb_hdr *,

			unsigned int /* length */);

extern unsigned int _GetXid(void);

extern void _FreeXid(unsigned int);

#define GetXid() (int)_GetXid(); cFYI(1,("CIFS VFS: in %s as Xid: %d with uid: %d",__func__, xid,current_fsuid()));

fs/cifs/connect.c

+1 −3
Original line number Diff line number Diff line
@@ -1860,9 +1860,7 @@ ipv4_connect(struct TCP_Server_Info *server) 
			smb_buf = (struct smb_hdr *)ses_init_buf;

			/* sizeof RFC1002_SESSION_REQUEST with no scope */

			smb_buf->smb_buf_length = 0x81000044;

			rc = smb_send(socket, smb_buf, 0x44,

				(struct sockaddr *) &server->addr.sockAddr,

				server->noblocksnd);

			rc = smb_send(server, smb_buf, 0x44);

			kfree(ses_init_buf);

			msleep(1); /* RFC1001 layer in at least one server

				      requires very short break before negprot

fs/cifs/transport.c

+19 −88
Original line number Diff line number Diff line
@@ -154,81 +154,8 @@ void DeleteTconOplockQEntries(struct cifsTconInfo *tcon) 
	spin_unlock(&GlobalMid_Lock);

}



int

smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer,

	 unsigned int smb_buf_length, struct sockaddr *sin, bool noblocksnd)

{

	int rc = 0;

	int i = 0;

	struct msghdr smb_msg;

	struct kvec iov;

	unsigned len = smb_buf_length + 4;



	if (ssocket == NULL)

		return -ENOTSOCK; /* BB eventually add reconnect code here */

	iov.iov_base = smb_buffer;

	iov.iov_len = len;



	smb_msg.msg_name = sin;

	smb_msg.msg_namelen = sizeof(struct sockaddr);

	smb_msg.msg_control = NULL;

	smb_msg.msg_controllen = 0;

	if (noblocksnd)

		smb_msg.msg_flags = MSG_DONTWAIT + MSG_NOSIGNAL;

	else

		smb_msg.msg_flags = MSG_NOSIGNAL;



	/* smb header is converted in header_assemble. bcc and rest of SMB word

	   area, and byte area if necessary, is converted to littleendian in

	   cifssmb.c and RFC1001 len is converted to bigendian in smb_send

	   Flags2 is converted in SendReceive */



	smb_buffer->smb_buf_length = cpu_to_be32(smb_buffer->smb_buf_length);

	cFYI(1, ("Sending smb of length %d", smb_buf_length));

	dump_smb(smb_buffer, len);



	while (len > 0) {

		rc = kernel_sendmsg(ssocket, &smb_msg, &iov, 1, len);

		if ((rc == -ENOSPC) || (rc == -EAGAIN)) {

			i++;

		/* smaller timeout here than send2 since smaller size */

		/* Although it may not be required, this also is smaller

		   oplock break time */

			if (i > 12) {

				cERROR(1,

				   ("sends on sock %p stuck for 7 seconds",

				    ssocket));

				rc = -EAGAIN;

				break;

			}

			msleep(1 << i);

			continue;

		}

		if (rc < 0)

			break;

		else

			i = 0; /* reset i after each successful send */

		iov.iov_base += rc;

		iov.iov_len -= rc;

		len -= rc;

	}



	if (rc < 0) {

		cERROR(1, ("Error %d sending data on socket to server", rc));

	} else {

		rc = 0;

	}



	/* Don't want to modify the buffer as a

	   side effect of this call. */

	smb_buffer->smb_buf_length = smb_buf_length;



	return rc;

}



static int

smb_send2(struct TCP_Server_Info *server, struct kvec *iov, int n_vec,

	  struct sockaddr *sin, bool noblocksnd)

smb_sendv(struct TCP_Server_Info *server, struct kvec *iov, int n_vec)

{

	int rc = 0;

	int i = 0;
@@ -243,11 +170,11 @@ smb_send2(struct TCP_Server_Info *server, struct kvec *iov, int n_vec, 
	if (ssocket == NULL)

		return -ENOTSOCK; /* BB eventually add reconnect code here */



	smb_msg.msg_name = sin;

	smb_msg.msg_name = (struct sockaddr *) &server->addr.sockAddr;

	smb_msg.msg_namelen = sizeof(struct sockaddr);

	smb_msg.msg_control = NULL;

	smb_msg.msg_controllen = 0;

	if (noblocksnd)

	if (server->noblocksnd)

		smb_msg.msg_flags = MSG_DONTWAIT + MSG_NOSIGNAL;

	else

		smb_msg.msg_flags = MSG_NOSIGNAL;
@@ -339,6 +266,18 @@ smb_send2(struct TCP_Server_Info *server, struct kvec *iov, int n_vec, 
	return rc;

}



int

smb_send(struct TCP_Server_Info *server, struct smb_hdr *smb_buffer,

	 unsigned int smb_buf_length)

{

	struct kvec iov;



	iov.iov_base = smb_buffer;

	iov.iov_len = smb_buf_length + 4;



	return smb_sendv(server, &iov, 1);

}



static int wait_for_free_request(struct cifsSesInfo *ses, const int long_op)

{

	if (long_op == CIFS_ASYNC_OP) {
@@ -540,9 +479,7 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, 
#ifdef CONFIG_CIFS_STATS2

	atomic_inc(&ses->server->inSend);

#endif

	rc = smb_send2(ses->server, iov, n_vec,

		      (struct sockaddr *) &(ses->server->addr.sockAddr),

		       ses->server->noblocksnd);

	rc = smb_sendv(ses->server, iov, n_vec);

#ifdef CONFIG_CIFS_STATS2

	atomic_dec(&ses->server->inSend);

	midQ->when_sent = jiffies;
@@ -736,9 +673,7 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, 
#ifdef CONFIG_CIFS_STATS2

	atomic_inc(&ses->server->inSend);

#endif

	rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length,

		      (struct sockaddr *) &(ses->server->addr.sockAddr),

		      ses->server->noblocksnd);

	rc = smb_send(ses->server, in_buf, in_buf->smb_buf_length);

#ifdef CONFIG_CIFS_STATS2

	atomic_dec(&ses->server->inSend);

	midQ->when_sent = jiffies;
@@ -879,9 +814,7 @@ send_nt_cancel(struct cifsTconInfo *tcon, struct smb_hdr *in_buf, 
		mutex_unlock(&ses->server->srv_mutex);

		return rc;

	}

	rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length,

	      (struct sockaddr *) &(ses->server->addr.sockAddr),

	      ses->server->noblocksnd);

	rc = smb_send(ses->server, in_buf, in_buf->smb_buf_length);

	mutex_unlock(&ses->server->srv_mutex);

	return rc;

}
@@ -973,9 +906,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifsTconInfo *tcon, 
#ifdef CONFIG_CIFS_STATS2

	atomic_inc(&ses->server->inSend);

#endif

	rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length,

		      (struct sockaddr *) &(ses->server->addr.sockAddr),

		      ses->server->noblocksnd);

	rc = smb_send(ses->server, in_buf, in_buf->smb_buf_length);

#ifdef CONFIG_CIFS_STATS2

	atomic_dec(&ses->server->inSend);

	midQ->when_sent = jiffies;

CRA Git | Maintained and supported by SUSTech CRA and CCSE