diff options
| author | Jeff Layton <jlayton@redhat.com> | 2008-12-30 18:39:16 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-01-29 04:32:12 +0100 |
| commit | 0496e02d8791e7f06673a19a181be30dad6eff70 (patch) | |
| tree | 2dc2f91e27ff0aba5b2b25314a01e858d5360748 /fs/cifs/connect.c | |
| parent | Linux 2.6.29-rc3 (diff) | |
| download | linux-0496e02d8791e7f06673a19a181be30dad6eff70.tar.xz linux-0496e02d8791e7f06673a19a181be30dad6eff70.zip | |
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: Jeff Layton <jlayton@redhat.com>
Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index e9ea394ee075..7419576228fb 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -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 |