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

Commit c84a301d authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus

parents f6760aa0 d3db7b48

drivers/block/drbd/drbd_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2973,7 +2973,6 @@ struct drbd_conf *drbd_new_device(unsigned int minor) 
		goto out_no_q;

	mdev->rq_queue = q;

	q->queuedata   = mdev;

	blk_queue_max_segment_size(q, DRBD_MAX_SEGMENT_SIZE);



	disk = alloc_disk(1);

	if (!disk)
@@ -2997,6 +2996,7 @@ struct drbd_conf *drbd_new_device(unsigned int minor) 
	q->backing_dev_info.congested_data = mdev;



	blk_queue_make_request(q, drbd_make_request_26);

	blk_queue_max_segment_size(q, DRBD_MAX_SEGMENT_SIZE);

	blk_queue_bounce_limit(q, BLK_BOUNCE_ANY);

	blk_queue_merge_bvec(q, drbd_merge_bvec);

	q->queue_lock = &mdev->req_lock; /* needed since we use */

drivers/block/drbd/drbd_receiver.c

+1 −1
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ static int receive_Barrier(struct drbd_conf *mdev, struct p_header *h) 
	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);