[TG3]: Update driver version and reldate.

[powerpc.git] / drivers / md / dm.c

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 243ff68..54fabbf 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -97,6 +97,7 @@ struct mapped_device {
         * freeze/thaw support require holding onto a super block
         */
        struct super_block *frozen_sb;
+       struct block_device *frozen_bdev;
 };
 
 #define MIN_IOS 256
@@ -383,7 +384,7 @@ static void __map_bio(struct dm_target *ti, struct bio *clone,
                /* error the io and bail out */
                struct dm_io *io = tio->io;
                free_tio(tio->io->md, tio);
-               dec_pending(io, -EIO);
+               dec_pending(io, r);
                bio_put(clone);
        }
 }
@@ -965,23 +966,20 @@ static void __flush_deferred_io(struct mapped_device *md, struct bio *c)
  */
 int dm_swap_table(struct mapped_device *md, struct dm_table *table)
 {
-       int r;
+       int r = -EINVAL;
 
        down_write(&md->lock);
 
        /* device must be suspended */
-       if (!test_bit(DMF_SUSPENDED, &md->flags)) {
-               up_write(&md->lock);
-               return -EPERM;
-       }
+       if (!test_bit(DMF_SUSPENDED, &md->flags))
+               goto out;
 
        __unbind(md);
        r = __bind(md, table);
-       if (r)
-               return r;
 
+out:
        up_write(&md->lock);
-       return 0;
+       return r;
 }
 
 /*
@@ -990,44 +988,50 @@ int dm_swap_table(struct mapped_device *md, struct dm_table *table)
  */
 static int __lock_fs(struct mapped_device *md)
 {
-       struct block_device *bdev;
+       int error = -ENOMEM;
 
        if (test_and_set_bit(DMF_FS_LOCKED, &md->flags))
                return 0;
 
-       bdev = bdget_disk(md->disk, 0);
-       if (!bdev) {
+       md->frozen_bdev = bdget_disk(md->disk, 0);
+       if (!md->frozen_bdev) {
                DMWARN("bdget failed in __lock_fs");
-               return -ENOMEM;
+               goto out;
        }
 
        WARN_ON(md->frozen_sb);
-       md->frozen_sb = freeze_bdev(bdev);
+
+       md->frozen_sb = freeze_bdev(md->frozen_bdev);
+       if (IS_ERR(md->frozen_sb)) {
+               error = PTR_ERR(md->frozen_sb);
+               goto out_bdput;
+       }
+
        /* don't bdput right now, we don't want the bdev
         * to go away while it is locked.  We'll bdput
         * in __unlock_fs
         */
        return 0;
+
+out_bdput:
+       bdput(md->frozen_bdev);
+       md->frozen_sb = NULL;
+       md->frozen_bdev = NULL;
+out:
+       clear_bit(DMF_FS_LOCKED, &md->flags);
+       return error;
 }
 
-static int __unlock_fs(struct mapped_device *md)
+static void __unlock_fs(struct mapped_device *md)
 {
-       struct block_device *bdev;
-
        if (!test_and_clear_bit(DMF_FS_LOCKED, &md->flags))
-               return 0;
+               return;
 
-       bdev = bdget_disk(md->disk, 0);
-       if (!bdev) {
-               DMWARN("bdget failed in __unlock_fs");
-               return -ENOMEM;
-       }
+       thaw_bdev(md->frozen_bdev, md->frozen_sb);
+       bdput(md->frozen_bdev);
 
-       thaw_bdev(bdev, md->frozen_sb);
        md->frozen_sb = NULL;
-       bdput(bdev);
-       bdput(bdev);
-       return 0;
+       md->frozen_bdev = NULL;
 }
 
 /*
@@ -1041,37 +1045,40 @@ int dm_suspend(struct mapped_device *md)
 {
        struct dm_table *map;
        DECLARE_WAITQUEUE(wait, current);
+       int error = -EINVAL;
 
        /* Flush I/O to the device. */
        down_read(&md->lock);
-       if (test_bit(DMF_BLOCK_IO, &md->flags)) {
-               up_read(&md->lock);
-               return -EINVAL;
-       }
+       if (test_bit(DMF_BLOCK_IO, &md->flags))
+               goto out_read_unlock;
 
        map = dm_get_table(md);
        if (map)
+               /* This does not get reverted if there's an error later. */
                dm_table_presuspend_targets(map);
-       __lock_fs(md);
+
+       error = __lock_fs(md);
+       if (error) {
+               dm_table_put(map);
+               goto out_read_unlock;
+       }
 
        up_read(&md->lock);
 
        /*
-        * First we set the BLOCK_IO flag so no more ios will be
-        * mapped.
+        * First we set the BLOCK_IO flag so no more ios will be mapped.
+        *
+        * If the flag is already set we know another thread is trying to
+        * suspend as well, so we leave the fs locked for this thread.
         */
+       error = -EINVAL;
        down_write(&md->lock);
-       if (test_bit(DMF_BLOCK_IO, &md->flags)) {
-               /*
-                * If we get here we know another thread is
-                * trying to suspend as well, so we leave the fs
-                * locked for this thread.
-                */
-               up_write(&md->lock);
-               return -EINVAL;
+       if (test_and_set_bit(DMF_BLOCK_IO, &md->flags)) {
+               if (map)
+                       dm_table_put(map);
+               goto out_write_unlock;
        }
 
-       set_bit(DMF_BLOCK_IO, &md->flags);
        add_wait_queue(&md->wait, &wait);
        up_write(&md->lock);
 
@@ -1099,12 +1106,9 @@ int dm_suspend(struct mapped_device *md)
        remove_wait_queue(&md->wait, &wait);
 
        /* were we interrupted ? */
-       if (atomic_read(&md->pending)) {
-               __unlock_fs(md);
-               clear_bit(DMF_BLOCK_IO, &md->flags);
-               up_write(&md->lock);
-               return -EINTR;
-       }
+       error = -EINTR;
+       if (atomic_read(&md->pending))
+               goto out_unfreeze;
 
        set_bit(DMF_SUSPENDED, &md->flags);
 
@@ -1115,6 +1119,17 @@ int dm_suspend(struct mapped_device *md)
        up_write(&md->lock);
 
        return 0;
+
+out_unfreeze:
+       __unlock_fs(md);
+       clear_bit(DMF_BLOCK_IO, &md->flags);
+out_write_unlock:
+       up_write(&md->lock);
+       return error;
+
+out_read_unlock:
+       up_read(&md->lock);
+       return error;
 }
 
 int dm_resume(struct mapped_device *md)