diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-08-23 16:17:13 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-14 18:38:22 +0200 |
| commit | 204bba9965c4cc175bf5bc65ddd19889e9085c72 (patch) | |
| tree | 49af2eedad06561d26fea943b3be5a89da07bd93 | |
| parent | 48acf8689847c061bd82c808c379f1bd79dfe407 (diff) | |
| download | blackbird-op-linux-204bba9965c4cc175bf5bc65ddd19889e9085c72.tar.gz blackbird-op-linux-204bba9965c4cc175bf5bc65ddd19889e9085c72.zip | |
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: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 99c937acb471..1eeb55423b3e 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -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 { |
