Fix drivers/md/dm.c fixes (needed backport due to s/frozen_bdev/suspended_bdev/

change that went in post 2.6.15).

diff --git a/queue/dm-free-minor-after-unlink-gendisk.patch b/queue/dm-free-minor-after-unlink-gendisk.patch
index 9be66a33c82192178a44c3d4651d9deb9e8c5cce..7790e98b50fcb323b28b49b05fffe0d905217e41 100644 (file)
--- a/queue/dm-free-minor-after-unlink-gendisk.patch
+++ b/queue/dm-free-minor-after-unlink-gendisk.patch
@@ -15,6 +15,7 @@ Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
 Acked-by: Alasdair G Kergon <agk@redhat.com>
 Cc: <stable@kernel.org>
 Signed-off-by: Andrew Morton <akpm@osdl.org>
+[chrisw: backport to 2.6.15]
 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
 ---
 
@@ -29,9 +30,9 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  {
 +      unsigned int minor = md->disk->first_minor;
 +
-       if (md->suspended_bdev) {
-               thaw_bdev(md->suspended_bdev, NULL);
-               bdput(md->suspended_bdev);
+       if (md->frozen_bdev) {
+               thaw_bdev(md->frozen_bdev, NULL);
+               bdput(md->frozen_bdev);
        }
 -      free_minor(md->disk->first_minor);
        mempool_destroy(md->tio_pool);

diff --git a/queue/dm-missing-bdput-thaw_bdev-at-removal.patch b/queue/dm-missing-bdput-thaw_bdev-at-removal.patch
index ba852ae164c258afc749a513d7c5f6bbd9689436..afe4665b4d23acd264fccce141f844fa92f164f8 100644 (file)
--- a/queue/dm-missing-bdput-thaw_bdev-at-removal.patch
+++ b/queue/dm-missing-bdput-thaw_bdev-at-removal.patch
@@ -15,6 +15,7 @@ Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
 Acked-by: Alasdair G Kergon <agk@redhat.com>
 Cc: <stable@kernel.org>
 Signed-off-by: Andrew Morton <akpm@osdl.org>
+[chrisw: backport to 2.6.15]
 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
 ---
 
@@ -27,9 +28,9 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
  
  static void free_dev(struct mapped_device *md)
  {
-+      if (md->suspended_bdev) {
-+              thaw_bdev(md->suspended_bdev, NULL);
-+              bdput(md->suspended_bdev);
++      if (md->frozen_bdev) {
++              thaw_bdev(md->frozen_bdev, NULL);
++              bdput(md->frozen_bdev);
 +      }
        free_minor(md->disk->first_minor);
        mempool_destroy(md->tio_pool);