Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e33b32de authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Get rid of first_peer_device() in handle_write_conflicts() 



Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent 6db7e50a

drivers/block/drbd/drbd_receiver.c

+3 −5
Original line number Diff line number Diff line
@@ -2065,7 +2065,7 @@ static void fail_postponed_requests(struct drbd_device *device, sector_t sector, 
static int handle_write_conflicts(struct drbd_device *device,

				  struct drbd_peer_request *peer_req)

{

	struct drbd_connection *connection = first_peer_device(device)->connection;

	struct drbd_connection *connection = peer_req->peer_device->connection;

	bool resolve_conflicts = test_bit(RESOLVE_CONFLICTS, &connection->flags);

	sector_t sector = peer_req->i.sector;

	const unsigned int size = peer_req->i.size;
@@ -2119,7 +2119,7 @@ static int handle_write_conflicts(struct drbd_device *device, 
			peer_req->w.cb = superseded ? e_send_superseded :

						   e_send_retry_write;

			list_add_tail(&peer_req->w.list, &device->done_ee);

			wake_asender(first_peer_device(device)->connection);

			wake_asender(connection);



			err = -ENOENT;

			goto out;
@@ -2148,9 +2148,7 @@ static int handle_write_conflicts(struct drbd_device *device, 
				 */

				err = drbd_wait_misc(device, &req->i);

				if (err) {

					_conn_request_state(first_peer_device(device)->connection,

							    NS(conn, C_TIMEOUT),

							    CS_HARD);

					_conn_request_state(connection, NS(conn, C_TIMEOUT), CS_HARD);

					fail_postponed_requests(device, sector, size);

					goto out;

				}