From 6fdf6995e7a657fd206e9d18402f6418f6266da6 Mon Sep 17 00:00:00 2001 From: "Martin K. Petersen" Date: Fri, 26 Feb 2010 00:20:36 -0500 Subject: [PATCH] --- yaml --- r: 182927 b: refs/heads/master c: e751e76a5f7adeee7438e68b0965559ad2864d0d h: refs/heads/master i: 182925: 41dd54c6baad63235aacbc7326c3e42f379b2e50 182923: 24e0e4f4d54c562e05af197a8a99c789d03df38c 182919: fa85f9814ba508c0b9cadcf3ddb6c9edf5e37074 182911: 44835a91141d7129bbf77c196d3ef320a9515988 v: v3 --- [refs] | 2 +- trunk/block/blk-settings.c | 9 --------- trunk/include/linux/blkdev.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index feca9d78247f..fad2511b0e52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2800aac1114548a9b47b6e0d398117cc01b89685 +refs/heads/master: e751e76a5f7adeee7438e68b0965559ad2864d0d diff --git a/trunk/block/blk-settings.c b/trunk/block/blk-settings.c index 605df9b3de8f..4db46f2fcbe5 100644 --- a/trunk/block/blk-settings.c +++ b/trunk/block/blk-settings.c @@ -239,15 +239,6 @@ void blk_queue_max_sectors(struct request_queue *q, unsigned int max_hw_sectors) } EXPORT_SYMBOL(blk_queue_max_sectors); -void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_sectors) -{ - if (BLK_DEF_MAX_SECTORS > max_sectors) - q->limits.max_hw_sectors = BLK_DEF_MAX_SECTORS; - else - q->limits.max_hw_sectors = max_sectors; -} -EXPORT_SYMBOL(blk_queue_max_hw_sectors); - /** * blk_queue_max_discard_sectors - set max sectors for a single discard * @q: the request queue for the device diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h index 2f17793048e7..c051cea2df07 100644 --- a/trunk/include/linux/blkdev.h +++ b/trunk/include/linux/blkdev.h @@ -922,7 +922,6 @@ extern void blk_cleanup_queue(struct request_queue *); extern void blk_queue_make_request(struct request_queue *, make_request_fn *); extern void blk_queue_bounce_limit(struct request_queue *, u64); extern void blk_queue_max_sectors(struct request_queue *, unsigned int); -extern void blk_queue_max_hw_sectors(struct request_queue *, unsigned int); extern void blk_queue_max_phys_segments(struct request_queue *, unsigned short); extern void blk_queue_max_hw_segments(struct request_queue *, unsigned short); extern void blk_queue_max_segment_size(struct request_queue *, unsigned int);