From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-4707-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 9601 invoked by alias); 4 Nov 2011 12:39:46 -0000
Received: (qmail 9575 invoked by uid 9737); 4 Nov 2011 12:39:46 -0000
Date: Fri, 04 Nov 2011 12:39:00 -0000
Message-ID: <20111104123946.9573.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/libdm libdm-deptree.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/msg00014.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-11-04 12:39:45

Modified files:
	libdm          : libdm-deptree.c 

Log message:
	Thin fix condition check for transation_id
	
	id2 must be checked.
	(missed in yesterday commit set).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-deptree.c.diff?cvsroot=lvm2&r1=1.144&r2=1.145

--- LVM2/libdm/libdm-deptree.c	2011/11/03 14:45:01	1.144
+++ LVM2/libdm/libdm-deptree.c	2011/11/04 12:39:45	1.145
@@ -2980,11 +2980,11 @@
 		tm->message.u.m_trim.new_size = id2;
 		break;
 	case DM_THIN_MESSAGE_SET_TRANSACTION_ID:
-		if ((id1 + 1) !=  id2) {
+		if ((id1 + 1) != id2) {
 			log_error("New transaction id must be sequential.");
 			return 0; /* FIXME: Maybe too strict here? */
 		}
-		if (id1 !=  seg->transaction_id) {
+		if (id2 != seg->transaction_id) {
 			log_error("Current transaction id is different from thin pool.");
 			return 0; /* FIXME: Maybe too strict here? */
 		}