Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (d613839e) · Commits · 戴 / test

block/blk-core.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@
		#include <linux/swap.h>
		#include <linux/writeback.h>
		#include <linux/task_io_accounting_ops.h>
		#include <linux/blktrace_api.h>
		#include <linux/fault-inject.h>

		#define CREATE_TRACE_POINTS
		@@ -498,6 +497,11 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)

		q->backing_dev_info.unplug_io_fn = blk_backing_dev_unplug;
		q->backing_dev_info.unplug_io_data = q;
		q->backing_dev_info.ra_pages =
		(VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
		q->backing_dev_info.state = 0;
		q->backing_dev_info.capabilities = BDI_CAP_MAP_COPY;

		err = bdi_init(&q->backing_dev_info);
		if (err) {
		kmem_cache_free(blk_requestq_cachep, q);

block/blk-settings.c

+27 −10

Original line number	Diff line number	Diff line
		@@ -95,6 +95,31 @@ void blk_queue_lld_busy(struct request_queue q, lld_busy_fn fn)
		}
		EXPORT_SYMBOL_GPL(blk_queue_lld_busy);

		/**
		* blk_set_default_limits - reset limits to default values
		* @limits: the queue_limits structure to reset
		*
		* Description:
		* Returns a queue_limit struct to its default state. Can be used by
		* stacking drivers like DM that stage table swaps and reuse an
		* existing device queue.
		*/
		void blk_set_default_limits(struct queue_limits *lim)
		{
		lim->max_phys_segments = MAX_PHYS_SEGMENTS;
		lim->max_hw_segments = MAX_HW_SEGMENTS;
		lim->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK;
		lim->max_segment_size = MAX_SEGMENT_SIZE;
		lim->max_sectors = lim->max_hw_sectors = SAFE_MAX_SECTORS;
		lim->logical_block_size = lim->physical_block_size = lim->io_min = 512;
		lim->bounce_pfn = BLK_BOUNCE_ANY;
		lim->alignment_offset = 0;
		lim->io_opt = 0;
		lim->misaligned = 0;
		lim->no_cluster = 0;
		}
		EXPORT_SYMBOL(blk_set_default_limits);

		/**
		* blk_queue_make_request - define an alternate make_request function for a device
		* @q: the request queue for the device to be affected
		@@ -123,18 +148,8 @@ void blk_queue_make_request(struct request_queue q, make_request_fn mfn)
		* set defaults
		*/
		q->nr_requests = BLKDEV_MAX_RQ;
		blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS);
		blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS);
		blk_queue_segment_boundary(q, BLK_SEG_BOUNDARY_MASK);
		blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE);

		q->make_request_fn = mfn;
		q->backing_dev_info.ra_pages =
		(VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
		q->backing_dev_info.state = 0;
		q->backing_dev_info.capabilities = BDI_CAP_MAP_COPY;
		blk_queue_max_sectors(q, SAFE_MAX_SECTORS);
		blk_queue_logical_block_size(q, 512);
		blk_queue_dma_alignment(q, 511);
		blk_queue_congestion_threshold(q);
		q->nr_batching = BLK_BATCH_REQ;
		@@ -147,6 +162,8 @@ void blk_queue_make_request(struct request_queue q, make_request_fn mfn)
		q->unplug_timer.function = blk_unplug_timeout;
		q->unplug_timer.data = (unsigned long)q;

		blk_set_default_limits(&q->limits);

		/*
		* by default assume old behaviour and bounce for any highmem page
		*/

block/cfq-iosched.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -122,7 +122,6 @@ struct cfq_data {
		struct cfq_queue *async_idle_cfqq;

		sector_t last_position;
		unsigned long last_end_request;

		/*
		* tunables, see top of file
		@@ -1253,7 +1252,7 @@ static int cfq_forced_dispatch(struct cfq_data *cfqd)

		BUG_ON(cfqd->busy_queues);

		cfq_log(cfqd, "forced_dispatch=%d\n", dispatched);
		cfq_log(cfqd, "forced_dispatch=%d", dispatched);
		return dispatched;
		}

		@@ -2164,9 +2163,6 @@ static void cfq_completed_request(struct request_queue q, struct request rq)
		if (cfq_cfqq_sync(cfqq))
		cfqd->sync_flight--;

		if (!cfq_class_idle(cfqq))
		cfqd->last_end_request = now;

		if (sync)
		RQ_CIC(rq)->last_end_request = now;

		@@ -2479,7 +2475,6 @@ static void cfq_init_queue(struct request_queue q)

		INIT_WORK(&cfqd->unplug_work, cfq_kick_queue);

		cfqd->last_end_request = jiffies;
		cfqd->cfq_quantum = cfq_quantum;
		cfqd->cfq_fifo_expire[0] = cfq_fifo_expire[0];
		cfqd->cfq_fifo_expire[1] = cfq_fifo_expire[1];

drivers/block/cciss.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@
		#include <linux/hdreg.h>
		#include <linux/spinlock.h>
		#include <linux/compat.h>
		#include <linux/blktrace_api.h>
		#include <asm/uaccess.h>
		#include <asm/io.h>

drivers/block/mg_disk.c

+1 −27

Original line number	Diff line number	Diff line
		@@ -22,13 +22,12 @@
		#include <linux/delay.h>
		#include <linux/platform_device.h>
		#include <linux/gpio.h>
		#include <linux/mg_disk.h>

		#define MG_RES_SEC (CONFIG_MG_DISK_RES << 1)

		/* name for block device */
		#define MG_DISK_NAME "mgd"
		/* name for platform device */
		#define MG_DEV_NAME "mg_disk"

		#define MG_DISK_MAJ 0
		#define MG_DISK_MAX_PART 16
		@@ -103,33 +102,8 @@
		#define MG_TMAX_SWRST_TO_RDY 500
		#define MG_TMAX_RSTOUT 3000

		/* device attribution */
		/* use mflash as boot device */
		#define MG_BOOT_DEV (1 << 0)
		/* use mflash as storage device */
		#define MG_STORAGE_DEV (1 << 1)
		/* same as MG_STORAGE_DEV, but bootloader already done reset sequence */
		#define MG_STORAGE_DEV_SKIP_RST (1 << 2)

		#define MG_DEV_MASK (MG_BOOT_DEV \| MG_STORAGE_DEV \| MG_STORAGE_DEV_SKIP_RST)

		/* names of GPIO resource */
		#define MG_RST_PIN "mg_rst"
		/* except MG_BOOT_DEV, reset-out pin should be assigned */
		#define MG_RSTOUT_PIN "mg_rstout"

		/* private driver data */
		struct mg_drv_data {
		/* disk resource */
		u32 use_polling;

		/* device attribution */
		u32 dev_attr;

		/* internally used */
		struct mg_host *host;
		};

		/* main structure for mflash driver */
		struct mg_host {
		struct device *dev;

Admin message