From 8f8d4b5e5f96ddfd2151afb48761436b9860d232 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Wed, 28 Mar 2012 18:41:24 +0100 Subject: [PATCH] --- yaml --- r: 296750 b: refs/heads/master c: fe878f34df89ad4af758f40bbec829807dc93a00 h: refs/heads/master v: v3 --- [refs] | 2 +- .../Documentation/device-mapper/thin-provisioning.txt | 10 ---------- trunk/drivers/md/dm-thin.c | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index cfbf4ca2e234..0ac92c56f49c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 035220b33d6865d81d5433600def53373cca7127 +refs/heads/master: fe878f34df89ad4af758f40bbec829807dc93a00 diff --git a/trunk/Documentation/device-mapper/thin-provisioning.txt b/trunk/Documentation/device-mapper/thin-provisioning.txt index 1ff044d87ca4..da50347c0053 100644 --- a/trunk/Documentation/device-mapper/thin-provisioning.txt +++ b/trunk/Documentation/device-mapper/thin-provisioning.txt @@ -237,16 +237,6 @@ iii) Messages Deletes a thin device. Irreversible. - trim - - Delete mappings from the end of a thin device. Irreversible. - You might want to use this if you're reducing the size of - your thinly-provisioned device. In many cases, due to the - sharing of blocks between devices, it is not possible to - determine in advance how much space 'trim' will release. (In - future a userspace tool might be able to perform this - calculation.) - set_transaction_id Userland volume managers, such as LVM, need a way to diff --git a/trunk/drivers/md/dm-thin.c b/trunk/drivers/md/dm-thin.c index da2f0217df66..1791134cf477 100644 --- a/trunk/drivers/md/dm-thin.c +++ b/trunk/drivers/md/dm-thin.c @@ -72,7 +72,7 @@ * missed out if the io covers the block. (schedule_copy). * * iv) insert the new mapping into the origin's btree - * (process_prepared_mappings). This act of inserting breaks some + * (process_prepared_mapping). This act of inserting breaks some * sharing of btree nodes between the two devices. Breaking sharing only * effects the btree of that specific device. Btrees for the other * devices that share the block never change. The btree for the origin