Commit 456eac94 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  fs/bio.c: fix shadows sparse warning
  drbd: The kernel code is now equivalent to out of tree release 8.3.7
  drbd: Allow online resizing of DRBD devices while peer not reachable (needs to be explicitly forced)
  drbd: Don't go into StandAlone mode when authentification failes because of network error
  drivers/block/drbd/drbd_receiver.c: correct NULL test
  cfq-iosched: Respect ioprio_class when preempting
  genhd: overlapping variable definition
  block: removed unused as_io_context
  DM: Fix device mapper topology stacking
  block: bdev_stack_limits wrapper
  block: Fix discard alignment calculation and printing
  block: Correct handling of bottom device misaligment
  drbd: check on CONFIG_LBDAF, not LBD
  drivers/block/drbd: Correct NULL test
  drbd: Silenced an assert that could triggered after changing write ordering method
  drbd: Kconfig fix
  drbd: Fix for a race between IO and a detach operation [Bugz 262]
  drbd: Use drbd_crypto_is_hash() instead of an open coded check
parents dedd0c2a f06f135d

block/blk-ioc.c

+0 −5
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ int put_io_context(struct io_context *ioc) 


	if (atomic_long_dec_and_test(&ioc->refcount)) {

		rcu_read_lock();

		if (ioc->aic && ioc->aic->dtor)

			ioc->aic->dtor(ioc->aic);

		cfq_dtor(ioc);

		rcu_read_unlock();
@@ -76,8 +74,6 @@ void exit_io_context(struct task_struct *task) 
	task_unlock(task);



	if (atomic_dec_and_test(&ioc->nr_tasks)) {

		if (ioc->aic && ioc->aic->exit)

			ioc->aic->exit(ioc->aic);

		cfq_exit(ioc);



	}
@@ -97,7 +93,6 @@ struct io_context *alloc_io_context(gfp_t gfp_flags, int node) 
		ret->ioprio = 0;

		ret->last_waited = jiffies; /* doesn't matter... */

		ret->nr_batch_requests = 0; /* because this is 0 */

		ret->aic = NULL;

		INIT_RADIX_TREE(&ret->radix_root, GFP_ATOMIC | __GFP_HIGH);

		INIT_HLIST_HEAD(&ret->cic_list);

		ret->ioc_data = NULL;

block/blk-settings.c

+35 −4
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 
		     sector_t offset)

{

	sector_t alignment;

	unsigned int top, bottom;

	unsigned int top, bottom, ret = 0;



	t->max_sectors = min_not_zero(t->max_sectors, b->max_sectors);

	t->max_hw_sectors = min_not_zero(t->max_hw_sectors, b->max_hw_sectors);
@@ -546,6 +546,8 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 
	t->max_segment_size = min_not_zero(t->max_segment_size,

					   b->max_segment_size);



	t->misaligned |= b->misaligned;



	alignment = queue_limit_alignment_offset(b, offset);



	/* Bottom device has different alignment.  Check that it is
@@ -558,8 +560,10 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 
		bottom = max(b->physical_block_size, b->io_min) + alignment;



		/* Verify that top and bottom intervals line up */

		if (max(top, bottom) & (min(top, bottom) - 1))

		if (max(top, bottom) & (min(top, bottom) - 1)) {

			t->misaligned = 1;

			ret = -1;

		}

	}



	t->logical_block_size = max(t->logical_block_size,
@@ -578,18 +582,21 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 
	if (t->physical_block_size & (t->logical_block_size - 1)) {

		t->physical_block_size = t->logical_block_size;

		t->misaligned = 1;

		ret = -1;

	}



	/* Minimum I/O a multiple of the physical block size? */

	if (t->io_min & (t->physical_block_size - 1)) {

		t->io_min = t->physical_block_size;

		t->misaligned = 1;

		ret = -1;

	}



	/* Optimal I/O a multiple of the physical block size? */

	if (t->io_opt & (t->physical_block_size - 1)) {

		t->io_opt = 0;

		t->misaligned = 1;

		ret = -1;

	}



	/* Find lowest common alignment_offset */
@@ -597,8 +604,10 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 
		& (max(t->physical_block_size, t->io_min) - 1);



	/* Verify that new alignment_offset is on a logical block boundary */

	if (t->alignment_offset & (t->logical_block_size - 1))

	if (t->alignment_offset & (t->logical_block_size - 1)) {

		t->misaligned = 1;

		ret = -1;

	}



	/* Discard alignment and granularity */

	if (b->discard_granularity) {
@@ -626,10 +635,32 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 
			(t->discard_granularity - 1);

	}



	return t->misaligned ? -1 : 0;

	return ret;

}

EXPORT_SYMBOL(blk_stack_limits);



/**

 * bdev_stack_limits - adjust queue limits for stacked drivers

 * @t:	the stacking driver limits (top device)

 * @bdev:  the component block_device (bottom)

 * @start:  first data sector within component device

 *

 * Description:

 *    Merges queue limits for a top device and a block_device.  Returns

 *    0 if alignment didn't change.  Returns -1 if adding the bottom

 *    device caused misalignment.

 */

int bdev_stack_limits(struct queue_limits *t, struct block_device *bdev,

		      sector_t start)

{

	struct request_queue *bq = bdev_get_queue(bdev);



	start += get_start_sect(bdev);



	return blk_stack_limits(t, &bq->limits, start << 9);

}

EXPORT_SYMBOL(bdev_stack_limits);



/**

 * disk_stack_limits - adjust queue limits for stacked drivers

 * @disk:  MD/DM gendisk (top)

block/cfq-iosched.c

+6 −0
Original line number Diff line number Diff line
@@ -3076,6 +3076,12 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq, 
	if (cfq_class_idle(cfqq))

		return true;



	/*

	 * Don't allow a non-RT request to preempt an ongoing RT cfqq timeslice.

	 */

	if (cfq_class_rt(cfqq) && !cfq_class_rt(new_cfqq))

		return false;



	/*

	 * if the new request is sync, but the currently running queue is

	 * not, let the sync request have priority.

block/genhd.c

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ static ssize_t disk_discard_alignment_show(struct device *dev, 
{

	struct gendisk *disk = dev_to_disk(dev);



	return sprintf(buf, "%u\n", queue_discard_alignment(disk->queue));

	return sprintf(buf, "%d\n", queue_discard_alignment(disk->queue));

}



static DEVICE_ATTR(range, S_IRUGO, disk_range_show, NULL);

drivers/block/drbd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



comment "DRBD disabled because PROC_FS, INET or CONNECTOR not selected"

	depends on !PROC_FS || !INET || !CONNECTOR

	depends on PROC_FS='n' || INET='n' || CONNECTOR='n'



config BLK_DEV_DRBD

	tristate "DRBD Distributed Replicated Block Device support"

CRA Git | Maintained and supported by SUSTech CRA and CCSE