Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: set socket send and receive timeouts before attempting connect
+8
-8
+8
-8
fs/cifs/connect.c
+8
-8
fs/cifs/connect.c
···
2474
2474
if (rc < 0)
2475
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
2478
* Eventually check for other socket options to change from
2487
2479
* the default. sock_setsockopt not used because it expects
···
2501
2509
cFYI(1, "sndbuf %d rcvbuf %d rcvtimeo 0x%lx",
2502
2510
socket->sk->sk_sndbuf,
2503
2511
socket->sk->sk_rcvbuf, socket->sk->sk_rcvtimeo);
2512
+
2513
+
rc = socket->ops->connect(socket, saddr, slen, 0);
2514
+
if (rc < 0) {
2515
+
cFYI(1, "Error %d connecting to server", rc);
2516
+
sock_release(socket);
2517
+
server->ssocket = NULL;
2518
+
return rc;
2519
+
}
2504
2520
2505
2521
if (sport == htons(RFC1001_PORT))
2506
2522
rc = ip_rfc1001_connect(server);