diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2012-07-26 08:12:59 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-09 08:05:45 -0500 |
commit | b666dbf819f9157a4afef2094ec961d216d802b5 (patch) | |
tree | 8adfc3059d6fc0d2e2e223244c6945e68c200c07 /drivers/block/drbd/drbd_receiver.c | |
parent | 3174f8c5045ad247563434c4b4897bd89313eafc (diff) |
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>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index a6f0b2938363..855cadfe6146 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -985,13 +985,9 @@ retry: | |||
985 | goto out_release_sockets; | 985 | goto out_release_sockets; |
986 | } | 986 | } |
987 | 987 | ||
988 | if (sock.socket && &msock.socket) { | 988 | ok = drbd_socket_okay(&sock.socket); |
989 | ok = drbd_socket_okay(&sock.socket); | 989 | ok = drbd_socket_okay(&msock.socket) && ok; |
990 | ok = drbd_socket_okay(&msock.socket) && ok; | 990 | } while (!ok); |
991 | if (ok) | ||
992 | break; | ||
993 | } | ||
994 | } while (1); | ||
995 | 991 | ||
996 | if (ad.s_listen) | 992 | if (ad.s_listen) |
997 | sock_release(ad.s_listen); | 993 | sock_release(ad.s_listen); |