Attachment 309020 Details for Bug 179786 – First patch (doesn't change functionality)

[patch] First patch (doesn't change functionality)

dm-bdev-rename-suspended_bdev-to-bdev.patch (text/plain), 3.56 KB, created by Mikuláš Patočka on 2008-06-12 01:48:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikuláš Patočka

Created: 2008-06-12 01:48:03 UTC

Size: 3.56 KB

patch

obsolete

>Rename suspended_bdev to bdev.
>
>This patch doesn't change any functionality, just renames the variable.
>In the next patch, the variable will be used even for non-suspended device.
>
>Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
>
>---
> drivers/md/dm.c |   36 ++++++++++++++++++------------------
> 1 file changed, 18 insertions(+), 18 deletions(-)
>
>Index: linux-2.6.26-rc4/drivers/md/dm.c
>===================================================================
>--- linux-2.6.26-rc4.orig/drivers/md/dm.c	2008-06-11 19:22:07.000000000 +0200
>+++ linux-2.6.26-rc4/drivers/md/dm.c	2008-06-11 19:22:09.000000000 +0200
>@@ -139,7 +139,7 @@ struct mapped_device {
> 	 * freeze/thaw support require holding onto a super block
> 	 */
> 	struct super_block *frozen_sb;
>-	struct block_device *suspended_bdev;
>+	struct block_device *bdev;
> 
> 	/* forced geometry settings */
> 	struct hd_geometry geometry;
>@@ -1100,9 +1100,9 @@ static void free_dev(struct mapped_devic
> {
> 	int minor = md->disk->first_minor;
> 
>-	if (md->suspended_bdev) {
>+	if (md->bdev) {
> 		unlock_fs(md);
>-		bdput(md->suspended_bdev);
>+		bdput(md->bdev);
> 	}
> 	destroy_workqueue(md->wq);
> 	mempool_destroy(md->tio_pool);
>@@ -1144,9 +1144,9 @@ static void __set_size(struct mapped_dev
> {
> 	set_capacity(md->disk, size);
> 
>-	mutex_lock(&md->suspended_bdev->bd_inode->i_mutex);
>-	i_size_write(md->suspended_bdev->bd_inode, (loff_t)size << SECTOR_SHIFT);
>-	mutex_unlock(&md->suspended_bdev->bd_inode->i_mutex);
>+	mutex_lock(&md->bdev->bd_inode->i_mutex);
>+	i_size_write(md->bdev->bd_inode, (loff_t)size << SECTOR_SHIFT);
>+	mutex_unlock(&md->bdev->bd_inode->i_mutex);
> }
> 
> static int __bind(struct mapped_device *md, struct dm_table *t)
>@@ -1162,7 +1162,7 @@ static int __bind(struct mapped_device *
> 	if (size != get_capacity(md->disk))
> 		memset(&md->geometry, 0, sizeof(md->geometry));
> 
>-	if (md->suspended_bdev)
>+	if (md->bdev)
> 		__set_size(md, size);
> 	if (size == 0)
> 		return 0;
>@@ -1385,7 +1385,7 @@ int dm_swap_table(struct mapped_device *
> 		goto out;
> 
> 	/* without bdev, the device size cannot be changed */
>-	if (!md->suspended_bdev)
>+	if (!md->bdev)
> 		if (get_capacity(md->disk) != dm_table_get_size(table))
> 			goto out;
> 
>@@ -1407,7 +1407,7 @@ static int lock_fs(struct mapped_device 
> 
> 	WARN_ON(md->frozen_sb);
> 
>-	md->frozen_sb = freeze_bdev(md->suspended_bdev);
>+	md->frozen_sb = freeze_bdev(md->bdev);
> 	if (IS_ERR(md->frozen_sb)) {
> 		r = PTR_ERR(md->frozen_sb);
> 		md->frozen_sb = NULL;
>@@ -1427,7 +1427,7 @@ static void unlock_fs(struct mapped_devi
> 	if (!test_bit(DMF_FROZEN, &md->flags))
> 		return;
> 
>-	thaw_bdev(md->suspended_bdev, md->frozen_sb);
>+	thaw_bdev(md->bdev, md->frozen_sb);
> 	md->frozen_sb = NULL;
> 	clear_bit(DMF_FROZEN, &md->flags);
> }
>@@ -1468,8 +1468,8 @@ int dm_suspend(struct mapped_device *md,
> 
> 	/* bdget() can stall if the pending I/Os are not flushed */
> 	if (!noflush) {
>-		md->suspended_bdev = bdget_disk(md->disk, 0);
>-		if (!md->suspended_bdev) {
>+		md->bdev = bdget_disk(md->disk, 0);
>+		if (!md->bdev) {
> 			DMWARN("bdget failed in dm_suspend");
> 			r = -ENOMEM;
> 			goto flush_and_out;
>@@ -1532,9 +1532,9 @@ flush_and_out:
> 		dm_queue_flush(md, DM_WQ_FLUSH_ALL, NULL);
> 
> out:
>-	if (r && md->suspended_bdev) {
>-		bdput(md->suspended_bdev);
>-		md->suspended_bdev = NULL;
>+	if (r && md->bdev) {
>+		bdput(md->bdev);
>+		md->bdev = NULL;
> 	}
> 
> 	dm_table_put(map);
>@@ -1565,9 +1565,9 @@ int dm_resume(struct mapped_device *md)
> 
> 	unlock_fs(md);
> 
>-	if (md->suspended_bdev) {
>-		bdput(md->suspended_bdev);
>-		md->suspended_bdev = NULL;
>+	if (md->bdev) {
>+		bdput(md->bdev);
>+		md->bdev = NULL;
> 	}
> 
> 	clear_bit(DMF_SUSPENDED, &md->flags);

Actions: View | Diff

Attachments on bug 179786: 309020 | 309021