block: change elevator to use __blk_end_request()

[safe/jmp/linux-2.6] / block / blk-sysfs.c

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index d9b9afa..21e275d 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -102,6 +102,11 @@ static ssize_t queue_max_sectors_show(struct request_queue *q, char *page)
        return queue_var_show(max_sectors_kb, (page));
 }
 
+static ssize_t queue_hw_sector_size_show(struct request_queue *q, char *page)
+{
+       return queue_var_show(q->hardsect_size, page);
+}
+
 static ssize_t
 queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)
 {
@@ -130,6 +135,51 @@ static ssize_t queue_max_hw_sectors_show(struct request_queue *q, char *page)
        return queue_var_show(max_hw_sectors_kb, (page));
 }
 
+static ssize_t queue_nomerges_show(struct request_queue *q, char *page)
+{
+       return queue_var_show(blk_queue_nomerges(q), page);
+}
+
+static ssize_t queue_nomerges_store(struct request_queue *q, const char *page,
+                                   size_t count)
+{
+       unsigned long nm;
+       ssize_t ret = queue_var_store(&nm, page, count);
+
+       spin_lock_irq(q->queue_lock);
+       if (nm)
+               queue_flag_set(QUEUE_FLAG_NOMERGES, q);
+       else
+               queue_flag_clear(QUEUE_FLAG_NOMERGES, q);
+
+       spin_unlock_irq(q->queue_lock);
+       return ret;
+}
+
+static ssize_t queue_rq_affinity_show(struct request_queue *q, char *page)
+{
+       unsigned int set = test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags);
+
+       return queue_var_show(set != 0, page);
+}
+
+static ssize_t
+queue_rq_affinity_store(struct request_queue *q, const char *page, size_t count)
+{
+       ssize_t ret = -EINVAL;
+#if defined(CONFIG_USE_GENERIC_SMP_HELPERS)
+       unsigned long val;
+
+       ret = queue_var_store(&val, page, count);
+       spin_lock_irq(q->queue_lock);
+       if (val)
+               queue_flag_set(QUEUE_FLAG_SAME_COMP, q);
+       else
+               queue_flag_clear(QUEUE_FLAG_SAME_COMP,  q);
+       spin_unlock_irq(q->queue_lock);
+#endif
+       return ret;
+}
 
 static struct queue_sysfs_entry queue_requests_entry = {
        .attr = {.name = "nr_requests", .mode = S_IRUGO | S_IWUSR },
@@ -160,12 +210,32 @@ static struct queue_sysfs_entry queue_iosched_entry = {
        .store = elv_iosched_store,
 };
 
+static struct queue_sysfs_entry queue_hw_sector_size_entry = {
+       .attr = {.name = "hw_sector_size", .mode = S_IRUGO },
+       .show = queue_hw_sector_size_show,
+};
+
+static struct queue_sysfs_entry queue_nomerges_entry = {
+       .attr = {.name = "nomerges", .mode = S_IRUGO | S_IWUSR },
+       .show = queue_nomerges_show,
+       .store = queue_nomerges_store,
+};
+
+static struct queue_sysfs_entry queue_rq_affinity_entry = {
+       .attr = {.name = "rq_affinity", .mode = S_IRUGO | S_IWUSR },
+       .show = queue_rq_affinity_show,
+       .store = queue_rq_affinity_store,
+};
+
 static struct attribute *default_attrs[] = {
        &queue_requests_entry.attr,
        &queue_ra_entry.attr,
        &queue_max_hw_sectors_entry.attr,
        &queue_max_sectors_entry.attr,
        &queue_iosched_entry.attr,
+       &queue_hw_sector_size_entry.attr,
+       &queue_nomerges_entry.attr,
+       &queue_rq_affinity_entry.attr,
        NULL,
 };
 
@@ -196,12 +266,13 @@ queue_attr_store(struct kobject *kobj, struct attribute *attr,
                    const char *page, size_t length)
 {
        struct queue_sysfs_entry *entry = to_queue(attr);
-       struct request_queue *q = container_of(kobj, struct request_queue, kobj);
-
+       struct request_queue *q;
        ssize_t res;
 
        if (!entry->store)
                return -EIO;
+
+       q = container_of(kobj, struct request_queue, kobj);
        mutex_lock(&q->sysfs_lock);
        if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags)) {
                mutex_unlock(&q->sysfs_lock);
@@ -264,10 +335,13 @@ int blk_register_queue(struct gendisk *disk)
 
        struct request_queue *q = disk->queue;
 
-       if (!q || !q->request_fn)
+       if (WARN_ON(!q))
                return -ENXIO;
 
-       ret = kobject_add(&q->kobj, kobject_get(&disk->dev.kobj),
+       if (!q->request_fn)
+               return 0;
+
+       ret = kobject_add(&q->kobj, kobject_get(&disk_to_dev(disk)->kobj),
                          "%s", "queue");
        if (ret < 0)
                return ret;
@@ -288,11 +362,14 @@ void blk_unregister_queue(struct gendisk *disk)
 {
        struct request_queue *q = disk->queue;
 
-       if (q && q->request_fn) {
+       if (WARN_ON(!q))
+               return;
+
+       if (q->request_fn) {
                elv_unregister_queue(q);
 
                kobject_uevent(&q->kobj, KOBJ_REMOVE);
                kobject_del(&q->kobj);
-               kobject_put(&disk->dev.kobj);
+               kobject_put(&disk_to_dev(disk)->kobj);
        }
 }