[SCSI] add support for variable length extended commands

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

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index d9b9afa..fc41d83 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)
 {
@@ -160,12 +165,18 @@ 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 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,
        NULL,
 };
 
@@ -196,12 +207,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,9 +276,12 @@ int blk_register_queue(struct gendisk *disk)
 
        struct request_queue *q = disk->queue;
 
-       if (!q || !q->request_fn)
+       if (WARN_ON(!q))
                return -ENXIO;
 
+       if (!q->request_fn)
+               return 0;
+
        ret = kobject_add(&q->kobj, kobject_get(&disk->dev.kobj),
                          "%s", "queue");
        if (ret < 0)
@@ -288,7 +303,10 @@ 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);