fs: dlm: move dlm allow conn

This patch checks if possible allowing new connections is allowed before
queueing the listen socket to accept new connections.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 02b636d113fb7463fb30ee1124808eb936dc8b4b..6b150e3aa30c7a991d83b5aa0ca405af7ad5db33 100644 (file)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -471,6 +471,9 @@ static void lowcomms_data_ready(struct sock *sk)
 
 static void lowcomms_listen_data_ready(struct sock *sk)
 {
+       if (!dlm_allow_conn)
+               return;
+
        queue_work(recv_workqueue, &listen_con.rwork);
 }
 
@@ -969,10 +972,6 @@ static int accept_from_sock(struct listen_connection *con)
        struct connection *addcon;
        unsigned int mark;
 
-       if (!dlm_allow_conn) {
-               return -1;
-       }
-
        if (!con->sock)
                return -ENOTCONN;