Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1223251

[PATCH 3.10 05/11] dm thin metadata: delete btrees when releasing metadata snapshot

Show all headers | View raw

3.10-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Joe Thornber <ejt@redhat.com>

commit 7f518ad0a212e2a6fd68630e176af1de395070a7 upstream.

The device details and mapping trees were just being decremented
before.  Now btree_del() is called to do a deep delete.

Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/md/dm-thin-metadata.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/md/dm-thin-metadata.c
+++ b/drivers/md/dm-thin-metadata.c
@@ -1281,8 +1281,8 @@ static int __release_metadata_snap(struc
 		return r;
 
 	disk_super = dm_block_data(copy);
-	dm_sm_dec_block(pmd->metadata_sm, le64_to_cpu(disk_super->data_mapping_root));
-	dm_sm_dec_block(pmd->metadata_sm, le64_to_cpu(disk_super->device_details_root));
+	dm_btree_del(&pmd->info, le64_to_cpu(disk_super->data_mapping_root));
+	dm_btree_del(&pmd->details_info, le64_to_cpu(disk_super->device_details_root));
 	dm_sm_dec_block(pmd->metadata_sm, held_root);
 
 	return dm_tm_unlock(pmd->tm, copy);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 3.10 00/11] 3.10.88-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-12 00:50 +0200
  [PATCH 3.10 10/11] crypto: caam - fix memory corruption in ahash_final_ctx Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-12 00:50 +0200
  [PATCH 3.10 03/11] mm/hwpoison: fix page refcount of unknown non LRU page Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-12 01:20 +0200
  [PATCH 3.10 04/11] perf: Fix fasync handling on inherited events Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-12 01:20 +0200
  [PATCH 3.10 09/11] libfc: Fix fc_fcp_cleanup_each_cmd() Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-12 01:20 +0200
  [PATCH 3.10 06/11] localmodconfig: Use Kbuild files too Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-12 01:20 +0200
  [PATCH 3.10 02/11] ipc/sem.c: update/correct memory barriers Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-12 01:20 +0200
  [PATCH 3.10 08/11] drm/radeon: add new OLAND pci id Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-12 01:20 +0200
  [PATCH 3.10 05/11] dm thin metadata: delete btrees when releasing metadata snapshot Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-12 01:20 +0200
  [PATCH 3.10 01/11] ipc,sem: fix use after free on IPC_RMID after a task using same semaphore set exits Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-12 01:20 +0200
  Re: [PATCH 3.10 00/11] 3.10.88-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2015-09-12 03:10 +0200
  Re: [PATCH 3.10 00/11] 3.10.88-stable review Guenter Roeck <linux@roeck-us.net> - 2015-09-12 06:30 +0200
  Re: [PATCH 3.10 00/11] 3.10.88-stable review Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-12 09:30 +0200
    Re: [PATCH 3.10 00/11] 3.10.88-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-12 18:00 +0200
      Re: [PATCH 3.10 00/11] 3.10.88-stable review Max Filippov <jcmvbkbc@gmail.com> - 2015-09-12 18:30 +0200
        Re: [PATCH 3.10 00/11] 3.10.88-stable review Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-12 19:40 +0200
          Re: [PATCH 3.10 00/11] 3.10.88-stable review Guenter Roeck <linux@roeck-us.net> - 2015-09-12 20:00 +0200
            Re: [PATCH 3.10 00/11] 3.10.88-stable review Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-12 20:20 +0200
        Re: [PATCH 3.10 00/11] 3.10.88-stable review Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-14 11:10 +0200
          Re: [PATCH 3.10 00/11] 3.10.88-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2015-09-21 06:40 +0200
      Re: [PATCH 3.10 00/11] 3.10.88-stable review Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-09-12 19:50 +0200
      Re: [PATCH 3.10 00/11] 3.10.88-stable review Guenter Roeck <linux@roeck-us.net> - 2015-09-12 19:50 +0200

csiph-web