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

Commit 204bba99 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Bugfix for regression introduced with f9bc8913c06022e 



If we intent to use the block_id member of an epoch entry,
we may not use the digest member.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 48acf868

drivers/block/drbd/drbd_worker.c

+3 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,9 @@ int w_e_end_csum_rs_req(struct drbd_conf *mdev, struct drbd_work *w, int cancel) 
			ok = drbd_send_ack(mdev, P_RS_IS_IN_SYNC, e);

		} else {

			inc_rs_pending(mdev);

			e->block_id = ID_SYNCER;

			e->block_id = ID_SYNCER; /* By setting block_id, digest pointer becomes invalid! */

			e->flags &= ~EE_HAS_DIGEST; /* This e no longer has a digest pointer */

			kfree(di);

			ok = drbd_send_block(mdev, P_RS_DATA_REPLY, e);

		}

	} else {