From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-4694-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 16915 invoked by alias); 3 Nov 2011 14:37:25 -0000
Received: (qmail 16844 invoked by uid 9737); 3 Nov 2011 14:37:24 -0000
Date: Thu, 03 Nov 2011 14:37:00 -0000
Message-ID: <20111103143724.16841.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/thin thin.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2011-11/txt/msg00001.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-11-03 14:37:24

Modified files:
	lib/thin       : thin.c 

Log message:
	Thin clean using delete_id consitently

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/thin/thin.c.diff?cvsroot=lvm2&r1=1.27&r2=1.28

--- LVM2/lib/thin/thin.c	2011/10/30 22:00:58	1.27
+++ LVM2/lib/thin/thin.c	2011/11/03 14:37:23	1.28
@@ -49,7 +49,7 @@
 {
 	const char *lv_name = NULL;
 	struct logical_volume *lv = NULL;
-	uint32_t device_id = 0;
+	uint32_t delete_id = 0;
 	dm_thin_message_t type;
 
 	/* Message must have only one from: create, trim, delete */
@@ -70,7 +70,7 @@
 		type = DM_THIN_MESSAGE_TRIM;
 	}
 
-	if (!dm_config_get_uint32(sn, "delete", &device_id)) {
+	if (!dm_config_get_uint32(sn, "delete", &delete_id)) {
 		if (!lv)
 			return SEG_LOG_ERROR("Unknown message in");
 	} else {
@@ -79,7 +79,7 @@
 		type = DM_THIN_MESSAGE_DELETE;
 	}
 
-	if (!attach_pool_message(seg, type, lv, device_id, 1))
+	if (!attach_pool_message(seg, type, lv, delete_id, 1))
 		return_0;
 
 	return 1;