block: make queue flags non-atomic

[linux-2.6] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 5ebfb4d7990170f3fc40344817d8b11c018eac1c..acd716b657b863c0e4e6ceae949968d0bc56448e 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -282,7 +282,8 @@ static mddev_t * mddev_find(dev_t unit)
                kfree(new);
                return NULL;
        }
-       set_bit(QUEUE_FLAG_CLUSTER, &new->queue->queue_flags);
+       /* Can be unlocked because the queue is new: no concurrency */
+       queue_flag_set_unlocked(QUEUE_FLAG_CLUSTER, new->queue);
 
        blk_queue_make_request(new->queue, md_fail_request);
 
@@ -731,9 +732,9 @@ static int super_90_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version
        else
                rdev->desc_nr = sb->this_disk.number;
 
-       if (refdev == 0)
+       if (!refdev) {
                ret = 1;
-       else {
+       } else {
                __u64 ev1, ev2;
                mdp_super_t *refsb = (mdp_super_t*)page_address(refdev->sb_page);
                if (!uuid_equal(refsb, sb)) {
@@ -1116,9 +1117,9 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)
        else
                rdev->desc_nr = le32_to_cpu(sb->dev_number);
 
-       if (refdev == 0)
+       if (!refdev) {
                ret = 1;
-       else {
+       } else {
                __u64 ev1, ev2;
                struct mdp_superblock_1 *refsb = 
                        (struct mdp_superblock_1*)page_address(refdev->sb_page);