Am Samstag, 23. Januar 2010 13:45:22 schrieb Dan Carpenter:
> epoch is always NULL here.
>
> Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
> ---
> This patch has only been compile tested. Sorry. :/
>
> --- orig/drivers/block/drbd/drbd_receiver.c 2010-01-23 10:53:13.000000000
> +0300 +++ devel/drivers/block/drbd/drbd_receiver.c 2010-01-23
> 10:54:19.000000000 +0300 @@ -1224,7 +1224,7 @@ static int
> receive_Barrier(struct drbd_c
> epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
> if (!epoch) {
> dev_warn(DEV, "Allocation of an epoch failed, slowing down\n");
> - issue_flush = !test_and_set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &epoch->flags);
> + issue_flush = !test_and_set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &mdev->current_epoch->flags);
> drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
> if (issue_flush) {
> rv = drbd_flush_after_epoch(mdev, mdev->current_epoch);
>
The patch is correct. It is going upstream though the DRBD tree.
See:
http://git.drbd.org/?p=linux-2.6-drbd.git;a=commit;h=d3db7b485ad7c467a61279d6a8ef51a3c83352df
-Phil
--
: Dipl-Ing Philipp Reisner
: LINBIT | Your Way to High Availability
: Tel: +43-1-8178292-50, Fax: +43-1-8178292-82
: http://www.linbit.com
DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria.
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
