diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-11-27 03:23:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-11-27 03:23:51 -0500 |
| commit | 7c9f29b128aab5ac95af553e8d8e0e372647f1d5 (patch) | |
| tree | 816e62e0ca82f1464f6055d7fc02c44dcfcc7481 | |
| parent | 05e5b136459b11cd9559370d5756719e08074fe0 (diff) | |
Revert "ll_rw_blk: temporarily enable max_segments tweaking"
This was a temporary debugging thing for sg chaining testing, revert
it now as it has served its purpose.
This reverts commit 563063a808de6b2004d5b8a09ddcb6125481f4b2.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| -rw-r--r-- | block/ll_rw_blk.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 3b927be03850..8b919940b2ab 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
| @@ -4080,23 +4080,7 @@ static ssize_t queue_max_hw_sectors_show(struct request_queue *q, char *page) | |||
| 4080 | return queue_var_show(max_hw_sectors_kb, (page)); | 4080 | return queue_var_show(max_hw_sectors_kb, (page)); |
| 4081 | } | 4081 | } |
| 4082 | 4082 | ||
| 4083 | static ssize_t queue_max_segments_show(struct request_queue *q, char *page) | ||
| 4084 | { | ||
| 4085 | return queue_var_show(q->max_phys_segments, page); | ||
| 4086 | } | ||
| 4087 | |||
| 4088 | static ssize_t queue_max_segments_store(struct request_queue *q, | ||
| 4089 | const char *page, size_t count) | ||
| 4090 | { | ||
| 4091 | unsigned long segments; | ||
| 4092 | ssize_t ret = queue_var_store(&segments, page, count); | ||
| 4093 | 4083 | ||
| 4094 | spin_lock_irq(q->queue_lock); | ||
| 4095 | q->max_phys_segments = segments; | ||
| 4096 | spin_unlock_irq(q->queue_lock); | ||
| 4097 | |||
| 4098 | return ret; | ||
| 4099 | } | ||
| 4100 | static struct queue_sysfs_entry queue_requests_entry = { | 4084 | static struct queue_sysfs_entry queue_requests_entry = { |
| 4101 | .attr = {.name = "nr_requests", .mode = S_IRUGO | S_IWUSR }, | 4085 | .attr = {.name = "nr_requests", .mode = S_IRUGO | S_IWUSR }, |
| 4102 | .show = queue_requests_show, | 4086 | .show = queue_requests_show, |
| @@ -4120,12 +4104,6 @@ static struct queue_sysfs_entry queue_max_hw_sectors_entry = { | |||
| 4120 | .show = queue_max_hw_sectors_show, | 4104 | .show = queue_max_hw_sectors_show, |
| 4121 | }; | 4105 | }; |
| 4122 | 4106 | ||
| 4123 | static struct queue_sysfs_entry queue_max_segments_entry = { | ||
| 4124 | .attr = {.name = "max_segments", .mode = S_IRUGO | S_IWUSR }, | ||
| 4125 | .show = queue_max_segments_show, | ||
| 4126 | .store = queue_max_segments_store, | ||
| 4127 | }; | ||
| 4128 | |||
| 4129 | static struct queue_sysfs_entry queue_iosched_entry = { | 4107 | static struct queue_sysfs_entry queue_iosched_entry = { |
| 4130 | .attr = {.name = "scheduler", .mode = S_IRUGO | S_IWUSR }, | 4108 | .attr = {.name = "scheduler", .mode = S_IRUGO | S_IWUSR }, |
| 4131 | .show = elv_iosched_show, | 4109 | .show = elv_iosched_show, |
| @@ -4137,7 +4115,6 @@ static struct attribute *default_attrs[] = { | |||
| 4137 | &queue_ra_entry.attr, | 4115 | &queue_ra_entry.attr, |
| 4138 | &queue_max_hw_sectors_entry.attr, | 4116 | &queue_max_hw_sectors_entry.attr, |
| 4139 | &queue_max_sectors_entry.attr, | 4117 | &queue_max_sectors_entry.attr, |
| 4140 | &queue_max_segments_entry.attr, | ||
| 4141 | &queue_iosched_entry.attr, | 4118 | &queue_iosched_entry.attr, |
| 4142 | NULL, | 4119 | NULL, |
| 4143 | }; | 4120 | }; |
