Devices only needs syncing when creating snapshots,
so make this optional when suspending a device.
Signed-Off-By: Alasdair G Kergon <[email protected]>
Index: linux-2.6.14/drivers/md/dm-ioctl.c
===================================================================
--- linux-2.6.14.orig/drivers/md/dm-ioctl.c 2005-11-14 23:10:57.000000000 +0000
+++ linux-2.6.14/drivers/md/dm-ioctl.c 2005-11-14 23:11:24.000000000 +0000
@@ -700,7 +700,7 @@ static int do_suspend(struct dm_ioctl *p
return -ENXIO;
if (!dm_suspended(md))
- r = dm_suspend(md);
+ r = dm_suspend(md, 1);
if (!r)
r = __dev_status(md, param);
@@ -738,7 +738,7 @@ static int do_resume(struct dm_ioctl *pa
if (new_map) {
/* Suspend if it isn't already suspended */
if (!dm_suspended(md))
- dm_suspend(md);
+ dm_suspend(md, 1);
r = dm_swap_table(md, new_map);
if (r) {
Index: linux-2.6.14/drivers/md/dm.h
===================================================================
--- linux-2.6.14.orig/drivers/md/dm.h 2005-11-14 23:10:57.000000000 +0000
+++ linux-2.6.14/drivers/md/dm.h 2005-11-14 23:11:24.000000000 +0000
@@ -69,7 +69,7 @@ void dm_put(struct mapped_device *md);
/*
* A device can still be used while suspended, but I/O is deferred.
*/
-int dm_suspend(struct mapped_device *md);
+int dm_suspend(struct mapped_device *md, int with_lockfs);
int dm_resume(struct mapped_device *md);
/*
Index: linux-2.6.14/drivers/md/dm.c
===================================================================
--- linux-2.6.14.orig/drivers/md/dm.c 2005-11-14 23:10:57.000000000 +0000
+++ linux-2.6.14/drivers/md/dm.c 2005-11-14 23:11:24.000000000 +0000
@@ -55,6 +55,7 @@ union map_info *dm_get_mapinfo(struct bi
*/
#define DMF_BLOCK_IO 0
#define DMF_SUSPENDED 1
+#define DMF_FROZEN 2
struct mapped_device {
struct rw_semaphore io_lock;
@@ -1021,6 +1022,8 @@ static int lock_fs(struct mapped_device
return r;
}
+ set_bit(DMF_FROZEN, &md->flags);
+
/* don't bdput right now, we don't want the bdev
* to go away while it is locked.
*/
@@ -1029,8 +1032,12 @@ static int lock_fs(struct mapped_device
static void unlock_fs(struct mapped_device *md)
{
+ if (!test_bit(DMF_FROZEN, &md->flags))
+ return;
+
thaw_bdev(md->suspended_bdev, md->frozen_sb);
md->frozen_sb = NULL;
+ clear_bit(DMF_FROZEN, &md->flags);
}
/*
@@ -1040,7 +1047,7 @@ static void unlock_fs(struct mapped_devi
* dm_bind_table, dm_suspend must be called to flush any in
* flight bios and ensure that any further io gets deferred.
*/
-int dm_suspend(struct mapped_device *md)
+int dm_suspend(struct mapped_device *md, int do_lockfs)
{
struct dm_table *map = NULL;
DECLARE_WAITQUEUE(wait, current);
@@ -1064,9 +1071,11 @@ int dm_suspend(struct mapped_device *md)
}
/* Flush I/O to the device. */
- r = lock_fs(md);
- if (r)
- goto out;
+ if (do_lockfs) {
+ r = lock_fs(md);
+ if (r)
+ goto out;
+ }
/*
* First we set the BLOCK_IO flag so no more ios will be mapped.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
