From patchwork Tue Jan 8 13:54:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 1946151 Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by patchwork2.kernel.org (Postfix) with ESMTP id AE9D8DF23A for ; Tue, 8 Jan 2013 13:58:48 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r08Du0rh019966; Tue, 8 Jan 2013 08:56:00 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r08DsYZV004684 for ; Tue, 8 Jan 2013 08:54:34 -0500 Received: from mx1.redhat.com (ext-mx11.extmail.prod.ext.phx2.redhat.com [10.5.110.16]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r08DsYcr005093 for ; Tue, 8 Jan 2013 08:54:34 -0500 Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r08DsX2N024223 for ; Tue, 8 Jan 2013 08:54:33 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 9CE34A5213; Tue, 8 Jan 2013 14:54:29 +0100 (CET) From: Hannes Reinecke To: Christophe Varoqui Date: Tue, 8 Jan 2013 14:54:10 +0100 Message-Id: <1357653259-62650-33-git-send-email-hare@suse.de> In-Reply-To: <1357653259-62650-1-git-send-email-hare@suse.de> References: <1357653259-62650-1-git-send-email-hare@suse.de> X-RedHat-Spam-Score: -7.299 (BAYES_00, DCC_REPUT_00_12, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.16 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com Subject: [dm-devel] [PATCH 32/42] Make 'allocated' an integer in vector.h X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com I don't trust the programmers here, as we're unconditionally decreasing the 'allocated' setting on vector_free(). So better make that an integer to catch underflows. Signed-off-by: Hannes Reinecke --- libmultipath/vector.c | 2 +- libmultipath/vector.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libmultipath/vector.c b/libmultipath/vector.c index 74079a4..dcf69bf 100644 --- a/libmultipath/vector.c +++ b/libmultipath/vector.c @@ -114,7 +114,7 @@ vector_del_slot(vector v, int slot) v->allocated -= VECTOR_DEFAULT_SIZE; - if (!v->allocated) { + if (v->allocated <= 0) { FREE(v->slot); v->slot = NULL; v->allocated = 0; diff --git a/libmultipath/vector.h b/libmultipath/vector.h index 6779186..7612b4c 100644 --- a/libmultipath/vector.h +++ b/libmultipath/vector.h @@ -25,7 +25,7 @@ /* vector definition */ struct _vector { - unsigned int allocated; + int allocated; void **slot; }; typedef struct _vector *vector;