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

Commit 9376d9f8 authored by Philipp Reisner's avatar Philipp Reisner Committed by Jens Axboe
Browse files

drbd: move invalidating the whole bitmap out of after_state ch() 



To avoid other state change requests, after passing through
sanitize_state(), to be mistaken for an invalidate,
move the "set all bits as out-of-sync" into the invalidate path.

Make invalidate and invalidate-remote behave consistently wrt.
current connection state (need either an established replication link,
or really be disconnected). Also mention that in the documentation.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a700471b

drivers/block/drbd/drbd_nl.c

+20 −16
Original line number Diff line number Diff line
@@ -2448,18 +2448,22 @@ int drbd_adm_invalidate(struct sk_buff *skb, struct genl_info *info) 


	retcode = _drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_T), CS_ORDERED);



	if (retcode < SS_SUCCESS && retcode != SS_NEED_CONNECTION)

		retcode = drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_T));



	while (retcode == SS_NEED_CONNECTION) {

		spin_lock_irq(&mdev->tconn->req_lock);

		if (mdev->state.conn < C_CONNECTED)

			retcode = _drbd_set_state(_NS(mdev, disk, D_INCONSISTENT), CS_VERBOSE, NULL);

		spin_unlock_irq(&mdev->tconn->req_lock);



		if (retcode != SS_NEED_CONNECTION)

			break;



	/* If that did not work, try again,

	 * but log failures this time (implicit CS_VERBOSE).

	 *

	 * If we happen to be C_STANDALONE R_SECONDARY,

	 * just change to D_INCONSISTENT, and set all bits in the bitmap.

	 * Otherwise, we just fail, to avoid races with the resync handshake.

	 */

	if (retcode < SS_SUCCESS) {

		if (mdev->state.conn == C_STANDALONE && mdev->state.role == R_SECONDARY) {

			retcode = drbd_request_state(mdev, NS(disk, D_INCONSISTENT));

			if (retcode >= SS_SUCCESS) {

				if (drbd_bitmap_io(mdev, &drbd_bmio_set_n_write,

					"set_n_write from invalidate", BM_LOCKED_MASK))

					retcode = ERR_IO_MD_DISK;

			}

		} else

			retcode = drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_T));

	}

	drbd_resume_io(mdev);
@@ -2517,9 +2521,9 @@ int drbd_adm_invalidate_peer(struct sk_buff *skb, struct genl_info *info) 


	retcode = _drbd_request_state(mdev, NS(conn, C_STARTING_SYNC_S), CS_ORDERED);

	if (retcode < SS_SUCCESS) {

		if (retcode == SS_NEED_CONNECTION && mdev->state.role == R_PRIMARY) {

			/* The peer will get a resync upon connect anyways.

			 * Just make that into a full resync. */

		if (mdev->state.conn == C_STANDALONE && mdev->state.role == R_PRIMARY) {

			/* The peer will get a resync upon connect anyways. Just make that

			   into a full resync. */

			retcode = drbd_request_state(mdev, NS(pdsk, D_INCONSISTENT));

			if (retcode >= SS_SUCCESS) {

				if (drbd_bitmap_io(mdev, &drbd_bmio_set_susp_al,

drivers/block/drbd/drbd_state.c

+0 −7
Original line number Diff line number Diff line
@@ -1377,13 +1377,6 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, 
			&drbd_bmio_set_n_write, &abw_start_sync,

			"set_n_write from StartingSync", BM_LOCKED_TEST_ALLOWED);



	/* We are invalidating our self... */

	if (os.conn < C_CONNECTED && ns.conn < C_CONNECTED &&

	    os.disk > D_INCONSISTENT && ns.disk == D_INCONSISTENT)

		/* other bitmap operation expected during this phase */

		drbd_queue_bitmap_io(mdev, &drbd_bmio_set_n_write, NULL,

			"set_n_write from invalidate", BM_LOCKED_MASK);



	/* first half of local IO error, failure to attach,

	 * or administrative detach */

	if (os.disk != D_FAILED && ns.disk == D_FAILED) {