From c690c07d89470ffe7fae54acabc3a0f3bf40edf5 Mon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Fri, 31 Jul 2009 11:49:11 -0400
Subject: [PATCH] --- yaml --- r: 156367 b: refs/heads/master c:
 7c958e32649e0c35801762878fb0b6da8c55a515 h: refs/heads/master i:   156365:
 b8a76fc45b8e58c6bbaf922caafbe0dabaf53f82   156363:
 da45851a23f28f0a84281126e745e143ff8c3cf4   156359:
 54f3e0fdb50bfd9faf9d9761551518c78c426ab6   156351:
 9d7f6dadf2fc8cebfc67822326e3ae1dcbf7d496 v: v3

---
 [refs]                       |  2 +-
 trunk/block/blk-settings.c   | 31 ++++++++++++++++++++++++-------
 trunk/include/linux/blkdev.h |  1 +
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index ddb07836da56..aa8d90255157 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fef246672b009cf3f7a74e2fc9a76932ef2eeed2
+refs/heads/master: 7c958e32649e0c35801762878fb0b6da8c55a515
diff --git a/trunk/block/blk-settings.c b/trunk/block/blk-settings.c
index 8e86e2d2b147..1f7197434166 100644
--- a/trunk/block/blk-settings.c
+++ b/trunk/block/blk-settings.c
@@ -383,6 +383,29 @@ void blk_queue_alignment_offset(struct request_queue *q, unsigned int offset)
 }
 EXPORT_SYMBOL(blk_queue_alignment_offset);
 
+/**
+ * blk_limits_io_min - set minimum request size for a device
+ * @limits: the queue limits
+ * @min:  smallest I/O size in bytes
+ *
+ * Description:
+ *   Some devices have an internal block size bigger than the reported
+ *   hardware sector size.  This function can be used to signal the
+ *   smallest I/O the device can perform without incurring a performance
+ *   penalty.
+ */
+void blk_limits_io_min(struct queue_limits *limits, unsigned int min)
+{
+	limits->io_min = min;
+
+	if (limits->io_min < limits->logical_block_size)
+		limits->io_min = limits->logical_block_size;
+
+	if (limits->io_min < limits->physical_block_size)
+		limits->io_min = limits->physical_block_size;
+}
+EXPORT_SYMBOL(blk_limits_io_min);
+
 /**
  * blk_queue_io_min - set minimum request size for the queue
  * @q:	the request queue for the device
@@ -396,13 +419,7 @@ EXPORT_SYMBOL(blk_queue_alignment_offset);
  */
 void blk_queue_io_min(struct request_queue *q, unsigned int min)
 {
-	q->limits.io_min = min;
-
-	if (q->limits.io_min < q->limits.logical_block_size)
-		q->limits.io_min = q->limits.logical_block_size;
-
-	if (q->limits.io_min < q->limits.physical_block_size)
-		q->limits.io_min = q->limits.physical_block_size;
+	blk_limits_io_min(&q->limits, min);
 }
 EXPORT_SYMBOL(blk_queue_io_min);
 
diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h
index e7cb5dbf6c26..69103e053c92 100644
--- a/trunk/include/linux/blkdev.h
+++ b/trunk/include/linux/blkdev.h
@@ -913,6 +913,7 @@ extern void blk_queue_logical_block_size(struct request_queue *, unsigned short)
 extern void blk_queue_physical_block_size(struct request_queue *, unsigned short);
 extern void blk_queue_alignment_offset(struct request_queue *q,
 				       unsigned int alignment);
+extern void blk_limits_io_min(struct queue_limits *limits, unsigned int min);
 extern void blk_queue_io_min(struct request_queue *q, unsigned int min);
 extern void blk_queue_io_opt(struct request_queue *q, unsigned int opt);
 extern void blk_set_default_limits(struct queue_limits *lim);