redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drbd: Remove redundant and wrong test for NULL simplification in conn_connect() 

Since the drbd_socket_okay() function itself tests if the the
socket is NULL, the explicit test "if (sock.socket && &msock.socket)"
was redundent.
Apart from that the address opperator ('&') before msock.socket rendered
the test pointless.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
hifive-unleashed-5.1
Philipp Reisner 2012-07-26 14:12:59 +02:00
parent 3174f8c504
commit b666dbf819
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/block/drbd/drbd_receiver.c
View File

@ -985,13 +985,9 @@ retry:
goto out_release_sockets;
}
if (sock.socket && &msock.socket) {
ok = drbd_socket_okay(&sock.socket);
ok = drbd_socket_okay(&msock.socket) && ok;
if (ok)
break;
}
} while (1);
ok = drbd_socket_okay(&sock.socket);
ok = drbd_socket_okay(&msock.socket) && ok;
} while (!ok);
if (ad.s_listen)
sock_release(ad.s_listen);