[PATCH] md: provide proper rcu_dereference / rcu_assign_pointer annotations in md

Acked-by: <paulmck@us.ibm.com>
Signed-off-by: Suzanne Wood <suzannew@cs.pdx.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index c06f4474192b..ae2c5fd6105d 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -63,7 +63,7 @@ static int multipath_map (multipath_conf_t *conf)
 
         rcu_read_lock();
         for (i = 0; i < disks; i++) {
-                mdk_rdev_t *rdev = conf->multipaths[i].rdev;
+                mdk_rdev_t *rdev = rcu_dereference(conf->multipaths[i].rdev);
                 if (rdev && rdev->in_sync) {
                         atomic_inc(&rdev->nr_pending);
                         rcu_read_unlock();
@@ -139,7 +139,7 @@ static void unplug_slaves(mddev_t *mddev)
 
         rcu_read_lock();
         for (i=0; i<mddev->raid_disks; i++) {
-                mdk_rdev_t *rdev = conf->multipaths[i].rdev;
+                mdk_rdev_t *rdev = rcu_dereference(conf->multipaths[i].rdev);
                 if (rdev && !rdev->faulty && atomic_read(&rdev->nr_pending)) {
                         request_queue_t *r_queue = bdev_get_queue(rdev->bdev);
 
@@ -224,7 +224,7 @@ static int multipath_issue_flush(request_queue_t *q, struct gendisk *disk,
 
         rcu_read_lock();
         for (i=0; i<mddev->raid_disks && ret == 0; i++) {
-                mdk_rdev_t *rdev = conf->multipaths[i].rdev;
+                mdk_rdev_t *rdev = rcu_dereference(conf->multipaths[i].rdev);
                 if (rdev && !rdev->faulty) {
                         struct block_device *bdev = rdev->bdev;
                         request_queue_t *r_queue = bdev_get_queue(bdev);
@@ -331,7 +331,7 @@ static int multipath_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
                         conf->working_disks++;
                         rdev->raid_disk = path;
                         rdev->in_sync = 1;
-                        p->rdev = rdev;
+                        rcu_assign_pointer(p->rdev, rdev);
                         found = 1;
                 }