From 8125e70f6d7d8be3ba2256584b97429b7aefb2bc Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Mon, 27 Feb 2006 13:58:01 -0800 Subject: [PATCH] Fix drivers/md/dm.c fixes (needed backport due to s/frozen_bdev/suspended_bdev/ change that went in post 2.6.15). --- queue/dm-free-minor-after-unlink-gendisk.patch | 7 ++++--- queue/dm-missing-bdput-thaw_bdev-at-removal.patch | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/queue/dm-free-minor-after-unlink-gendisk.patch b/queue/dm-free-minor-after-unlink-gendisk.patch index 9be66a33c82..7790e98b50f 100644 --- 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 Acked-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton +[chrisw: backport to 2.6.15] Signed-off-by: Chris Wright --- @@ -29,9 +30,9 @@ Signed-off-by: Chris Wright { + 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 ba852ae164c..afe4665b4d2 100644 --- 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 Acked-by: Alasdair G Kergon Cc: Signed-off-by: Andrew Morton +[chrisw: backport to 2.6.15] Signed-off-by: Chris Wright --- @@ -27,9 +28,9 @@ Signed-off-by: Chris Wright 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); -- 2.47.3