]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
block: drbd: remove a stray unlock in __drbd_send_protocol()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 7 Nov 2019 07:48:47 +0000 (10:48 +0300)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 19 Dec 2019 15:58:58 +0000 (15:58 +0000)
commit 8e9c523016cf9983b295e4bc659183d1fa6ef8e0 upstream.

There are two callers of this function and they both unlock the mutex so
this ends up being a double unlock.

Fixes: 44ed167da748 ("drbd: rcu_read_lock() and rcu_dereference() for tconn->net_conf")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/block/drbd/drbd_main.c

index 960645c26e6fc1b107e0db1ae016fd15800d3514..a65ef5ac107fa303a66dcd749e93031ee0ca5165 100644 (file)
@@ -786,7 +786,6 @@ int __drbd_send_protocol(struct drbd_connection *connection, enum drbd_packet cm
 
        if (nc->tentative && connection->agreed_pro_version < 92) {
                rcu_read_unlock();
-               mutex_unlock(&sock->mutex);
                drbd_err(connection, "--dry-run is not supported by peer");
                return -EOPNOTSUPP;
        }