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

Commit 4fa63912 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Don't make debugfs depend on DEBUG_KERNEL
  [PATCH] Fix blktrace compile with sysfs not defined
  [PATCH] unused label in drivers/block/cciss.
  [BLOCK] increase size of disk stat counters
  [PATCH] blk_execute_rq_nowait-speedup
  [PATCH] ide-cd: quiet down GPCMD_READ_CDVD_CAPACITY failure
  [BLOCK] ll_rw_blk: kmalloc -> kzalloc conversion
  [PATCH] kzalloc() conversion in drivers/block
  [PATCH] update max_sectors documentation
parents df5b89b3 ae36b883

Documentation/block/biodoc.txt

+12 −2
Original line number Diff line number Diff line
@@ -132,8 +132,18 @@ Some new queue property settings: 
		limit. No highmem default.



	blk_queue_max_sectors(q, max_sectors)

		Maximum size request you can handle in units of 512 byte

		sectors. 255 default.

		Sets two variables that limit the size of the request.



		- The request queue's max_sectors, which is a soft size in

		in units of 512 byte sectors, and could be dynamically varied

		by the core kernel.



		- The request queue's max_hw_sectors, which is a hard limit

		and reflects the maximum size request a driver can handle

		in units of 512 byte sectors.



		The default for both max_sectors and max_hw_sectors is

		255. The upper limit of max_sectors is 1024.



	blk_queue_max_phys_segments(q, max_segments)

		Maximum physical segments you can handle in a request. 128

block/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ config LBD 


config BLK_DEV_IO_TRACE

	bool "Support for tracing block io actions"

	depends on SYSFS

	select RELAY

	select DEBUG_FS

	help

block/genhd.c

+3 −3
Original line number Diff line number Diff line
@@ -454,8 +454,8 @@ static ssize_t disk_stats_read(struct gendisk * disk, char *page) 
	disk_round_stats(disk);

	preempt_enable();

	return sprintf(page,

		"%8u %8u %8llu %8u "

		"%8u %8u %8llu %8u "

		"%8lu %8lu %8llu %8u "

		"%8lu %8lu %8llu %8u "

		"%8u %8u %8u"

		"\n",

		disk_stat_read(disk, ios[READ]),
@@ -649,7 +649,7 @@ static int diskstats_show(struct seq_file *s, void *v) 
	preempt_disable();

	disk_round_stats(gp);

	preempt_enable();

	seq_printf(s, "%4d %4d %s %u %u %llu %u %u %u %llu %u %u %u %u\n",

	seq_printf(s, "%4d %4d %s %lu %lu %llu %u %lu %lu %llu %u %u %u %u\n",

		gp->major, n + gp->first_minor, disk_name(gp, n, buf),

		disk_stat_read(gp, ios[0]), disk_stat_read(gp, merges[0]),

		(unsigned long long)disk_stat_read(gp, sectors[0]),

block/ll_rw_blk.c

+7 −7
Original line number Diff line number Diff line
@@ -908,17 +908,15 @@ init_tag_map(request_queue_t *q, struct blk_queue_tag *tags, int depth) 
				__FUNCTION__, depth);

	}



	tag_index = kmalloc(depth * sizeof(struct request *), GFP_ATOMIC);

	tag_index = kzalloc(depth * sizeof(struct request *), GFP_ATOMIC);

	if (!tag_index)

		goto fail;



	nr_ulongs = ALIGN(depth, BITS_PER_LONG) / BITS_PER_LONG;

	tag_map = kmalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);

	tag_map = kzalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);

	if (!tag_map)

		goto fail;



	memset(tag_index, 0, depth * sizeof(struct request *));

	memset(tag_map, 0, nr_ulongs * sizeof(unsigned long));

	tags->real_max_depth = depth;

	tags->max_depth = depth;

	tags->tag_index = tag_index;
@@ -2481,10 +2479,12 @@ void blk_execute_rq_nowait(request_queue_t *q, struct gendisk *bd_disk, 
	rq->rq_disk = bd_disk;

	rq->flags |= REQ_NOMERGE;

	rq->end_io = done;

	elv_add_request(q, rq, where, 1);

	generic_unplug_device(q);

	WARN_ON(irqs_disabled());

	spin_lock_irq(q->queue_lock);

	__elv_add_request(q, rq, where, 1);

	__generic_unplug_device(q);

	spin_unlock_irq(q->queue_lock);

}



EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);



/**

drivers/block/DAC960.c

+2 −5
Original line number Diff line number Diff line
@@ -311,11 +311,10 @@ static boolean DAC960_CreateAuxiliaryStructures(DAC960_Controller_T *Controller) 
		CommandsRemaining = CommandAllocationGroupSize;

	  CommandGroupByteCount =

		CommandsRemaining * CommandAllocationLength;

	  AllocationPointer = kmalloc(CommandGroupByteCount, GFP_ATOMIC);

	  AllocationPointer = kzalloc(CommandGroupByteCount, GFP_ATOMIC);

	  if (AllocationPointer == NULL)

		return DAC960_Failure(Controller,

					"AUXILIARY STRUCTURE CREATION");

	  memset(AllocationPointer, 0, CommandGroupByteCount);

	 }

      Command = (DAC960_Command_T *) AllocationPointer;

      AllocationPointer += CommandAllocationLength;
@@ -2709,14 +2708,12 @@ DAC960_DetectController(struct pci_dev *PCI_Device, 
  void __iomem *BaseAddress;

  int i;



  Controller = (DAC960_Controller_T *)

	kmalloc(sizeof(DAC960_Controller_T), GFP_ATOMIC);

  Controller = kzalloc(sizeof(DAC960_Controller_T), GFP_ATOMIC);

  if (Controller == NULL) {

	DAC960_Error("Unable to allocate Controller structure for "

                       "Controller at\n", NULL);

	return NULL;

  }

  memset(Controller, 0, sizeof(DAC960_Controller_T));

  Controller->ControllerNumber = DAC960_ControllerCount;

  DAC960_Controllers[DAC960_ControllerCount++] = Controller;

  Controller->Bus = PCI_Device->bus->number;