md: remove the 'super' sysfs attribute from devices in an 'md' array

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

diff --git a/block/blk-tag.c b/block/blk-tag.c
index d1fd300..4780a46 100644 (file)
--- a/block/blk-tag.c
+++ b/block/blk-tag.c
@@ -6,6 +6,8 @@
 #include <linux/bio.h>
 #include <linux/blkdev.h>
 
+#include "blk.h"
+
 /**
  * blk_queue_find_tag - find a request by its tag and queue
  * @q:  The request queue for the device
@@ -21,7 +23,6 @@ struct request *blk_queue_find_tag(struct request_queue *q, int tag)
 {
        return blk_map_queue_find_tag(q->queue_tags, tag);
 }
-
 EXPORT_SYMBOL(blk_queue_find_tag);
 
 /**
@@ -99,7 +100,6 @@ void blk_queue_free_tags(struct request_queue *q)
 {
        clear_bit(QUEUE_FLAG_QUEUED, &q->queue_flags);
 }
-
 EXPORT_SYMBOL(blk_queue_free_tags);
 
 static int
@@ -185,7 +185,8 @@ int blk_queue_init_tags(struct request_queue *q, int depth,
                if (!tags)
                        goto fail;
        } else if (q->queue_tags) {
-               if ((rc = blk_queue_resize_tags(q, depth)))
+               rc = blk_queue_resize_tags(q, depth);
+               if (rc)
                        return rc;
                set_bit(QUEUE_FLAG_QUEUED, &q->queue_flags);
                return 0;
@@ -203,7 +204,6 @@ fail:
        kfree(tags);
        return -ENOMEM;
 }
-
 EXPORT_SYMBOL(blk_queue_init_tags);
 
 /**
@@ -260,7 +260,6 @@ int blk_queue_resize_tags(struct request_queue *q, int new_depth)
        kfree(tag_map);
        return 0;
 }
-
 EXPORT_SYMBOL(blk_queue_resize_tags);
 
 /**
@@ -313,7 +312,6 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq)
        clear_bit_unlock(tag, bqt->tag_map);
        bqt->busy--;
 }
-
 EXPORT_SYMBOL(blk_queue_end_tag);
 
 /**
@@ -340,7 +338,7 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq)
        int tag;
 
        if (unlikely((rq->cmd_flags & REQ_QUEUED))) {
-               printk(KERN_ERR 
+               printk(KERN_ERR
                       "%s: request %p for device [%s] already tagged %d",
                       __FUNCTION__, rq,
                       rq->rq_disk ? rq->rq_disk->disk_name : "?", rq->tag);
@@ -370,7 +368,6 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq)
        bqt->busy++;
        return 0;
 }
-
 EXPORT_SYMBOL(blk_queue_start_tag);
 
 /**
@@ -392,5 +389,4 @@ void blk_queue_invalidate_tags(struct request_queue *q)
        list_for_each_safe(tmp, n, &q->tag_busy_list)
                blk_requeue_request(q, list_entry_rq(tmp));
 }
-
 EXPORT_SYMBOL(blk_queue_invalidate_tags);