diff options
| -rw-r--r-- | fs/cifs/connect.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 7f540df52527..c8cb83ef6f6f 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -2474,14 +2474,6 @@ generic_ip_connect(struct TCP_Server_Info *server) | |||
| 2474 | if (rc < 0) | 2474 | if (rc < 0) |
| 2475 | return rc; | 2475 | return rc; |
| 2476 | 2476 | ||
| 2477 | rc = socket->ops->connect(socket, saddr, slen, 0); | ||
| 2478 | if (rc < 0) { | ||
| 2479 | cFYI(1, "Error %d connecting to server", rc); | ||
| 2480 | sock_release(socket); | ||
| 2481 | server->ssocket = NULL; | ||
| 2482 | return rc; | ||
| 2483 | } | ||
| 2484 | |||
| 2485 | /* | 2477 | /* |
| 2486 | * Eventually check for other socket options to change from | 2478 | * Eventually check for other socket options to change from |
| 2487 | * the default. sock_setsockopt not used because it expects | 2479 | * the default. sock_setsockopt not used because it expects |
| @@ -2510,6 +2502,14 @@ generic_ip_connect(struct TCP_Server_Info *server) | |||
| 2510 | socket->sk->sk_sndbuf, | 2502 | socket->sk->sk_sndbuf, |
| 2511 | socket->sk->sk_rcvbuf, socket->sk->sk_rcvtimeo); | 2503 | socket->sk->sk_rcvbuf, socket->sk->sk_rcvtimeo); |
| 2512 | 2504 | ||
| 2505 | rc = socket->ops->connect(socket, saddr, slen, 0); | ||
| 2506 | if (rc < 0) { | ||
| 2507 | cFYI(1, "Error %d connecting to server", rc); | ||
| 2508 | sock_release(socket); | ||
| 2509 | server->ssocket = NULL; | ||
| 2510 | return rc; | ||
| 2511 | } | ||
| 2512 | |||
| 2513 | if (sport == htons(RFC1001_PORT)) | 2513 | if (sport == htons(RFC1001_PORT)) |
| 2514 | rc = ip_rfc1001_connect(server); | 2514 | rc = ip_rfc1001_connect(server); |
| 2515 | 2515 | ||
