diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /block/blk-sysfs.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'block/blk-sysfs.c')
| -rw-r--r-- | block/blk-sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 0749b89c6885..a26c930db346 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c | |||
| @@ -114,7 +114,7 @@ static ssize_t queue_max_segments_show(struct request_queue *q, char *page) | |||
| 114 | 114 | ||
| 115 | static ssize_t queue_max_segment_size_show(struct request_queue *q, char *page) | 115 | static ssize_t queue_max_segment_size_show(struct request_queue *q, char *page) |
| 116 | { | 116 | { |
| 117 | if (test_bit(QUEUE_FLAG_CLUSTER, &q->queue_flags)) | 117 | if (blk_queue_cluster(q)) |
| 118 | return queue_var_show(queue_max_segment_size(q), (page)); | 118 | return queue_var_show(queue_max_segment_size(q), (page)); |
| 119 | 119 | ||
| 120 | return queue_var_show(PAGE_CACHE_SIZE, (page)); | 120 | return queue_var_show(PAGE_CACHE_SIZE, (page)); |