fs: dlm: set subclass for othercon sock_mutex

This patch sets the lockdep subclass for the othercon socket mutex. In
various places the connection socket mutex is held while locking the
othercon socket mutex. This patch will remove lockdep warnings when such
case occurs.

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 f169e35..ca9bf54 100644 (file)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -934,13 +934,14 @@ static int accept_from_sock(struct listen_connection *con)
                                goto accept_err;
                        }
 
+                       lockdep_set_subclass(&othercon->sock_mutex, 1);
                        newcon->othercon = othercon;
                } else {
                        /* close other sock con if we have something new */
                        close_connection(othercon, false, true, false);
                }
 
-               mutex_lock_nested(&othercon->sock_mutex, 1);
+               mutex_lock(&othercon->sock_mutex);
                add_sock(newsock, othercon);
                addcon = othercon;
                mutex_unlock(&othercon->sock_mutex);