Commit b1bf9368 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block: (38 commits)
  block: don't access jiffies when initialising io_context
  cfq: remove 8 bytes of padding from cfq_rb_root on 64 bit builds
  block: fix for "Consolidate phys_segment and hw_segment limits"
  cfq-iosched: quantum check tweak
  blktrace: perform cleanup after setup error
  blkdev: fix merge_bvec_fn return value checks
  cfq-iosched: requests "in flight" vs "in driver" clarification
  cciss: Fix problem with scatter gather elements in the scsi half of the driver
  cciss: eliminate unnecessary pointer use in cciss scsi code
  cciss: do not use void pointer for scsi hba data
  cciss: factor out scatter gather chain block mapping code
  cciss: fix scatter gather chain block dma direction kludge
  cciss: simplify scatter gather code
  cciss: factor out scatter gather chain block allocation and freeing
  cciss: detect bad alignment of scsi commands at build time
  cciss: clarify command list padding calculation
  cfq-iosched: rethink seeky detection for SSDs
  cfq-iosched: rework seeky detection
  block: remove padding from io_context on 64bit builds
  block: Consolidate phys_segment and hw_segment limits
  ...
parents 524df557 4671a132

Documentation/ABI/testing/sysfs-block

+14 −0
Original line number Diff line number Diff line
@@ -128,3 +128,17 @@ Description: 
		preferred request size for workloads where sustained

		throughput is desired.  If no optimal I/O size is

		reported this file contains 0.



What:		/sys/block/<disk>/queue/nomerges

Date:		January 2010

Contact:

Description:

		Standard I/O elevator operations include attempts to

		merge contiguous I/Os. For known random I/O loads these

		attempts will always fail and result in extra cycles

		being spent in the kernel. This allows one to turn off

		this behavior on one of two ways: When set to 1, complex

		merge checks are disabled, but the simple one-shot merges

		with the previous I/O request are enabled. When set to 2,

		all merge tries are disabled. The default value is 0 -

		which enables all types of merge tries.

Documentation/block/queue-sysfs.txt

+5 −5
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ size allowed by the hardware. 


nomerges (RW)

-------------

This enables the user to disable the lookup logic involved with IO merging

requests in the block layer. Merging may still occur through a direct

1-hit cache, since that comes for (almost) free. The IO scheduler will not

waste cycles doing tree/hash lookups for merges if nomerges is 1. Defaults

to 0, enabling all merges.

This enables the user to disable the lookup logic involved with IO

merging requests in the block layer. By default (0) all merges are

enabled. When set to 1 only simple one-hit merges will be tried. When

set to 2 no merge algorithms will be tried (including one-hit or more

complex tree/hash lookups).



nr_requests (RW)

----------------

arch/um/drivers/ubd_kern.c

+2 −2
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ static int ubd_open_dev(struct ubd *ubd_dev) 
	ubd_dev->fd = fd;



	if(ubd_dev->cow.file != NULL){

		blk_queue_max_sectors(ubd_dev->queue, 8 * sizeof(long));

		blk_queue_max_hw_sectors(ubd_dev->queue, 8 * sizeof(long));



		err = -ENOMEM;

		ubd_dev->cow.bitmap = vmalloc(ubd_dev->cow.bitmap_len);
@@ -849,7 +849,7 @@ static int ubd_add(int n, char **error_out) 
	}

	ubd_dev->queue->queuedata = ubd_dev;



	blk_queue_max_hw_segments(ubd_dev->queue, MAX_SG);

	blk_queue_max_segments(ubd_dev->queue, MAX_SG);

	err = ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, &ubd_gendisk[n]);

	if(err){

		*error_out = "Failed to register device";

block/blk-cgroup.c

+0 −14
Original line number Diff line number Diff line
@@ -23,20 +23,6 @@ static LIST_HEAD(blkio_list); 
struct blkio_cgroup blkio_root_cgroup = { .weight = 2*BLKIO_WEIGHT_DEFAULT };

EXPORT_SYMBOL_GPL(blkio_root_cgroup);



bool blkiocg_css_tryget(struct blkio_cgroup *blkcg)

{

	if (!css_tryget(&blkcg->css))

		return false;

	return true;

}

EXPORT_SYMBOL_GPL(blkiocg_css_tryget);



void blkiocg_css_put(struct blkio_cgroup *blkcg)

{

	css_put(&blkcg->css);

}

EXPORT_SYMBOL_GPL(blkiocg_css_put);



struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup)

{

	return container_of(cgroup_subsys_state(cgroup, blkio_subsys_id),

block/blk-cgroup.h

+0 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ struct blkio_group { 
	unsigned long sectors;

};



extern bool blkiocg_css_tryget(struct blkio_cgroup *blkcg);

extern void blkiocg_css_put(struct blkio_cgroup *blkcg);



typedef void (blkio_unlink_group_fn) (void *key, struct blkio_group *blkg);

typedef void (blkio_update_group_weight_fn) (struct blkio_group *blkg,

						unsigned int weight);

CRA Git | Maintained and supported by SUSTech CRA and CCSE