[PATCH] serial/icom: Remove custom msescs_to_jiffies() macro

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

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index ea180af6d227e5d1e21dda9ab6c8219cff6dd9ca..f6b03957efc7b8bbd70f28f8ca1230b95ffeb4a3 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -991,36 +991,50 @@ int dm_swap_table(struct mapped_device *md, struct dm_table *table)
  */
 static int __lock_fs(struct mapped_device *md)
 {
+       int error = -ENOMEM;
+
        if (test_and_set_bit(DMF_FS_LOCKED, &md->flags))
                return 0;
 
        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(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)
 {
        if (!test_and_clear_bit(DMF_FS_LOCKED, &md->flags))
-               return 0;
+               return;
 
        thaw_bdev(md->frozen_bdev, md->frozen_sb);
        bdput(md->frozen_bdev);
 
        md->frozen_sb = NULL;
        md->frozen_bdev = NULL;
-
-       return 0;
 }
 
 /*
@@ -1034,37 +1048,37 @@ 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;
+
+       error = __lock_fs(md);
+       if (error)
+               goto out_read_unlock;
 
        map = dm_get_table(md);
        if (map)
                dm_table_presuspend_targets(map);
-       __lock_fs(md);
 
        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);
 
@@ -1092,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);
 
@@ -1108,6 +1119,18 @@ int dm_suspend(struct mapped_device *md)
        up_write(&md->lock);
 
        return 0;
+
+out_unfreeze:
+       /* FIXME Undo dm_table_presuspend_targets */
+       __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)